| commit | a243cf82c4f4508a8c881f1d653c6fc2c7f42a4b | [log] [download] |
|---|---|---|
| author | mastercoms <mastercoms@tuta.io> | Sun Mar 01 22:34:37 2020 -0500 |
| committer | mastercoms <mastercoms@tuta.io> | Sun Mar 01 22:34:37 2020 -0500 |
| tree | eb2ed6adb9429446550882ec411273d289b4544c | |
| parent | ca3690704c579c04fd1349dcd604f848177bbde8 [diff] | |
| parent | 2ada226f4d8e0af4e33d392c94ddd1968f1557a1 [diff] |
Merge branch 'dev' into 1.15 # Conflicts: # pom.xml # src/main/java/net/glowstone/GlowWorld.java # src/main/java/net/glowstone/block/blocktype/BlockBed.java # src/main/java/net/glowstone/block/blocktype/BlockType.java # src/main/java/net/glowstone/entity/GlowAnimal.java # src/main/java/net/glowstone/util/CompatibilityBundle.java