| commit | 8dc92c565cf7bc2eb91359e1c60517f9b2c5ccb8 | [log] [download] |
|---|---|---|
| author | mastercoms <mastercoms@tuta.io> | Tue Jul 23 09:57:58 2019 -0400 |
| committer | mastercoms <mastercoms@tuta.io> | Tue Jul 23 09:57:58 2019 -0400 |
| tree | 10fcf1394faa3aa08adb82edb3b36b1082917b97 | |
| parent | fb4af7117165f485218e3106f8394aca15e25b3a [diff] | |
| parent | c1fa66060d1e9c5efafed1fcea6f22fa43f2b355 [diff] |
Merge remote-tracking branch 'origin/dev' into 1.13 # Conflicts: # src/main/java/net/glowstone/entity/GlowLivingEntity.java # src/main/java/net/glowstone/net/http/HttpClient.java # src/main/java/net/glowstone/net/protocol/LoginProtocol.java # src/test/java/net/glowstone/net/LoginProtocolTest.java