| commit | 28004f53a30ae73147aacea66656a3eb9ed0ae0f | [log] [download] |
|---|---|---|
| author | mastercoms <mastercoms@tutanota.de> | Mon Nov 04 15:21:08 2019 -0500 |
| committer | mastercoms <mastercoms@tutanota.de> | Mon Nov 04 15:21:08 2019 -0500 |
| tree | 5b909e1a2730c6d988f4ee2caf32aabffa34c5ba | |
| parent | 9d1abae2c6e6f7a002a503c6b4020725c5235a36 [diff] | |
| parent | 89e000f9e85e4349870c8ce7884b2d5a6fe409db [diff] |
Merge branch 'dev' into 1.13 # Conflicts: # src/main/java/net/glowstone/constants/GlowBiomeClimate.java # src/main/java/net/glowstone/entity/GlowLivingEntity.java