| commit | 0cb80dafc7e580d44c76f3b4fe52aef562122546 | [log] [download] |
|---|---|---|
| author | Chris Hennick <4961925+Pr0methean@users.noreply.github.com> | Mon May 06 18:59:21 2019 -0700 |
| committer | Chris Hennick <4961925+Pr0methean@users.noreply.github.com> | Mon May 06 18:59:21 2019 -0700 |
| tree | 606722b54a546b0e4fd69cf24ca096f6a199127b | |
| parent | b2b07206bcae0998d9bda98fe87182c854cdd18b [diff] | |
| parent | d4812fe2d6f9499ea35d598c6ff85dee1d511d7c [diff] |
Merge branch 'dev' into 1.13, and partial bug fixes # Conflicts: # src/main/java/net/glowstone/GlowWorld.java # src/main/java/net/glowstone/block/blocktype/BlockSponge.java # src/main/java/net/glowstone/command/minecraft/TeleportCommand.java # src/main/java/net/glowstone/entity/GlowEntity.java