mc-server

Archived

This repository has been archived on 2022-03-24. You can view files and clone it, but cannot push or open issues or pull requests.

Go to file

DmitriyMX 63d6716ce3 Merge branch 'develop' into dmitriymx/location-refactory

# Conflicts:
#	core/src/main/java/mc/core/Location.java
#	flat_world/src/main/java/mc/world/flat/FlatWorld.java
#	generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java
#	proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java

2018-08-10 12:00:13 +03:00

core

Merge branch 'develop' into dmitriymx/location-refactory

2018-08-10 12:00:13 +03:00

event-loop

Minor merging fixes

2018-08-10 03:27:57 +07:00

flat_world

Merge branch 'develop' into dmitriymx/location-refactory

2018-08-10 12:00:13 +03:00

generated_world

Merge branch 'develop' into dmitriymx/location-refactory