Commit graph

622 commits

Author SHA1 Message Date
Redned
6dbb09de81
Merge pull request #301 from DoctorMacc/gitignore
Add .gitignore entry for locales folder
2020-04-09 15:40:29 -05:00
Camotoy
369f1cf127
Add .gitignore for locales folder 2020-04-09 16:13:03 -04:00
Redned
e1d1f9ee8a
Merge pull request #275 from rtm516/server-language-processing
Server language processing
2020-04-09 12:29:10 -05:00
rtm516
78fdab2090 Removed left in debug line 2020-04-09 17:34:49 +01:00
rtm516
81c1533ee2 en_us user now gets a chat message if the locale isnt already loaded 2020-04-09 17:21:51 +01:00
rtm516
013bca024c Removed auto download and load of en_us 2020-04-09 17:06:17 +01:00
rtm516
64e0af48f9 Merge remote-tracking branch 'origin/master' into server-language-processing 2020-04-09 16:56:14 +01:00
Redned
95eece4608
Merge pull request #297 from rtm516/patch-1
Fixed DEBUG logs not showing in newer Java versions for standalone builds
2020-04-09 10:52:40 -05:00
rtm516
7465a98098
Fixed DEBUG logs not showing in newer Java versions 2020-04-09 16:46:59 +01:00
Redned
d01eb956a7
Merge pull request #296 from rtm516/player-remove-fix
Fixed players not getting removed from the players map on disconnect
2020-04-09 10:35:46 -05:00
rtm516
b43a3e9abd Fixed players not getting removed from the players map on disconnect 2020-04-09 15:26:14 +01:00
rtm516
1ef50cbb95 Added automatic en_us download and extraction from JAR 2020-04-09 14:36:32 +01:00
rtm516
c51a48221b Merge remote-tracking branch 'origin/master' into server-language-processing 2020-04-09 13:58:45 +01:00
Redned
77a7b55fb1
Merge pull request #294 from DoctorMacc/bows
Fix bows, potentially buckets, other items
2020-04-08 23:04:08 -05:00
DoctorMacc
0521a30266 Simplify 2020-04-08 22:17:29 -04:00
DoctorMacc
c393dc9f21 Initial bow support 2020-04-08 21:29:33 -04:00
rtm516
bc67675d16 Added translation of extra message parts 2020-04-09 01:30:27 +01:00
rtm516
70a71b2ee8 Updated mappings commit 2020-04-09 00:23:21 +01:00
rtm516
c61d87714b On demand downloading and loading of language files 2020-04-09 00:20:41 +01:00
Redned
9c07371f7f
Merge pull request #293 from DoctorMacc/bees
Add entity flag for if bee has nectar
2020-04-08 17:07:02 -05:00
DoctorMacc
c41740a9fa Add entity flag for if bee has nectar 2020-04-08 17:58:07 -04:00
rtm516
2cd5472ff0 Started work on the locale fetching and loading system 2020-04-08 21:11:56 +01:00
Redned
ece1eeb451
Merge pull request #274 from rtm516/shutdown-fix
Kick players on shutdown and fix window not closing on standalone
2020-04-07 19:20:01 -05:00
Redned
553b72bf30
Merge pull request #289 from DoctorMacc/llama-decoration
Add llama decoration support
2020-04-07 19:19:20 -05:00
rtm516
8e1b5de4b0
Merge branch 'master' into shutdown-fix 2020-04-08 01:07:12 +01:00
DoctorMacc
d4f23379ef Fix requested change; modify comments 2020-04-07 20:06:20 -04:00
rtm516
70975a1d36 Updated player count for ade40d5 2020-04-08 01:03:25 +01:00
DoctorMacc
20700998b1 Fix requested changes; remove unused import 2020-04-07 19:57:34 -04:00
Redned
ade40d5a8b
Only add the player to the players map once 2020-04-07 18:54:58 -05:00
DoctorMacc
bbf0baf948 Additional explanation comment 2020-04-07 19:40:35 -04:00
Redned
c0d96f0632
Merge pull request #287 from DoctorMacc/map-quick-fix
Fix maps spamming error in console
2020-04-07 18:39:39 -05:00
DoctorMacc
03c611224b Add llama decoration support 2020-04-07 19:38:44 -04:00
DoctorMacc
12e67d9b28 Merge branch 'master' of https://github.com/GeyserMC/Geyser into map-quick-fix 2020-04-07 18:23:22 -04:00
Redned
9bdc083963
Merge pull request #286 from DoctorMacc/trader-llamas
Fix trader llamas not appearing; add llama metadata
2020-04-07 15:32:41 -05:00
Redned
e2ff71f4eb
Merge pull request #285 from endevrr/feature/falling-blocks
Add falling blocks
2020-04-07 15:31:12 -05:00
William Johnstone
c44708cc22 Add requested changes 2020-04-07 21:22:10 +01:00
DoctorMacc
588c89ded2 Fix requested changes 2020-04-07 16:21:42 -04:00
DoctorMacc
b8c1a1d0ba Fix trader llamas not appearing; show llama variant 2020-04-07 16:12:55 -04:00
William Johnstone
8cab3cce26 Add falling blocks 2020-04-07 20:45:59 +01:00
DoctorMacc
9c282d2cb8 Quick map fix 2020-04-07 13:54:08 -04:00
DoctorMacc
2d2b4704dc Potential error spam fix 2020-04-06 20:57:26 -04:00
rtm516
90dc33e394 Fixed support for ctrl+c shutdown 2020-04-06 14:47:07 +01:00
rtm516
41e0de4484 Cleaned up language 2020-04-06 14:35:18 +01:00
rtm516
c114f49e84 Fixed player count and removed debug code 2020-04-06 14:34:45 +01:00
rtm516
d4fa651427 Made the server kick all players before we shutdown and close the window when we finish on standalone. 2020-04-06 14:33:36 +01:00
rtm516
28217adfdf Added support for numbered param replacements 2020-04-05 23:37:41 +01:00
rtm516
9a6b537e89 Removed debugging line 2020-04-05 22:49:10 +01:00
rtm516
49df48fcf0 Fixed some strings getting missed 2020-04-05 22:47:03 +01:00
Redned
16388a1f85
Merge pull request #272 from rtm516/patch-3
Kick the user on incorrect login info
2020-04-05 15:58:50 -05:00
rtm516
18311e3c1c Added argument parsing to serverside language processing 2020-04-05 12:19:20 +01:00