Commit graph

780 commits

Author SHA1 Message Date
OnlyBMan
87e372ce21 Put everything into bedrock mapping 2020-04-14 19:34:11 -04:00
OnlyBMan
3972cc7f87 Fix comments 2020-04-14 18:40:05 -04:00
OnlyBMan
08eb99fa94 Implement skulls and heads 2020-04-14 18:33:55 -04:00
Redned
b1f8ad10f0
Merge pull request #322 from DoctorMacc/grindstone
Implement grindstone
2020-04-12 17:49:45 -05:00
DoctorMacc
fc988dfd70 Implement grindstone 2020-04-12 18:32:07 -04:00
Redned
083d2e3fba
Merge pull request #320 from DoctorMacc/protocol-update
Update Protocol to 2.5.5-SNAPSHOT
2020-04-12 16:28:10 -05:00
DoctorMacc
2c75415dc8 Update Protocol to 2.5.5-SNAPSHOT 2020-04-12 14:38:47 -04:00
RednedEpic
605c9ef4db Merge branch 'master' into inventory 2020-04-11 22:46:25 -05:00
Redned
68d7f2629a
Merge pull request #317 from DoctorMacc/item-animation
Item pickup animation
2020-04-11 17:57:07 -05:00
Redned
00198af794
Merge pull request #316 from AJ-Ferguson/dimension-login-fix
Fix crash on some devices when logging into a different dimension
2020-04-11 17:50:25 -05:00
DoctorMacc
ce7954d8ab Add license 2020-04-11 18:50:01 -04:00
Redned
fe382e5864
Merge pull request #310 from DoctorMacc/villagers
Villager visuals
2020-04-11 17:49:41 -05:00
DoctorMacc
5116f250ad Add item collection animation 2020-04-11 18:48:04 -04:00
DoctorMacc
f3344dbfed Change villager maps to private final 2020-04-11 15:18:22 -04:00
Redned
e5f0840335
Merge pull request #315 from rtm516/waterlogged-fix
Fixes waterlogged blocks in master
2020-04-11 14:17:06 -05:00
Redned
3d462e9d02
Merge pull request #314 from rtm516/bossbar-title-fix
Added translation to bossbar titles
2020-04-11 14:14:52 -05:00
rtm516
613626915a Copied fix from inventory a00cf75 2020-04-11 20:11:46 +01:00
AJ Ferguson
f04a267d98 Only show login form if AuthType is Online 2020-04-11 10:53:27 -08:00
rtm516
1abc0f9764 Added translation to bossbar titles 2020-04-11 19:43:29 +01:00
AJ Ferguson
95bcc04177 Fix crash on some devices when logging into a different dimension 2020-04-11 10:33:06 -08:00
DoctorMacc
0af919effe Merge latest master 2020-04-11 11:38:32 -04:00
DoctorMacc
6b04f2b5d8 Final touches 2020-04-11 11:35:14 -04:00
Redned
e17edbcebc
Merge pull request #306 from DoctorMacc/end-gateway-fix
(Inventory Branch) Fix End Gateway causing crashes
2020-04-10 17:16:30 -05:00
DoctorMacc
e2e4fb2b3c Some final touches 2020-04-10 18:11:16 -04:00
DoctorMacc
f046ef52f1 Add license 2020-04-10 18:06:35 -04:00
DoctorMacc
d547b31b38 Fix first load crashing; fix NPE 2020-04-10 16:36:41 -04:00
DoctorMacc
1dc6d4fbdc Fixed 2020-04-10 16:07:36 -04:00
Redned
d8ff735626
Merge pull request #298 from rtm516/language-and-colour-fix
Fixed language processing and chat colours being reset for no reason
2020-04-10 15:06:55 -05:00
Redned
9c736d23df
Merge pull request #305 from AJ-Ferguson/block-placement-fix
Fix block placement for stairs, slabs, etc.
2020-04-10 15:06:05 -05:00
AJ Ferguson
23d98bb25f Fix block placement for stairs, slabs, etc. 2020-04-10 10:46:29 -08:00
Redned
27f4879f0a
Merge pull request #300 from DoctorMacc/cats
Add extra metadata for tameable entities
2020-04-09 19:29:42 -05:00
DoctorMacc
6359fd4e83 Use switch statement for cat variant color 2020-04-09 20:23:52 -04:00
DoctorMacc
a580edc78f Little touch 2020-04-09 20:20:41 -04:00
DoctorMacc
d0a7f6282c Initial villager types support 2020-04-09 19:33:52 -04:00
DoctorMacc
8f735ae453 Remove debug code 2020-04-09 18:12:53 -04:00
DoctorMacc
c777641a90 Changes? 2020-04-09 17:53:38 -04:00
DoctorMacc
5ecbb49cf8 Merge branch 'master' of https://github.com/GeyserMC/Geyser into cats 2020-04-09 16:45:34 -04:00
Redned
6dbb09de81
Merge pull request #301 from DoctorMacc/gitignore
Add .gitignore entry for locales folder
2020-04-09 15:40:29 -05:00
DoctorMacc
c1dbd64f12 Add wolf collar support 2020-04-09 16:36:30 -04:00
Camotoy
369f1cf127
Add .gitignore for locales folder 2020-04-09 16:13:03 -04:00
DoctorMacc
c2fc3a7873 Add copyright 2020-04-09 16:09:03 -04:00
DoctorMacc
af4edf159a Add tameable entity features 2020-04-09 16:06:00 -04:00
rtm516
9f1da99b71 Fixed NONE colour formatting and cleaned up imports 2020-04-09 20:24:32 +01:00
rtm516
1e1d2f00ae Fixed language processing and chat colours being reset for no reason 2020-04-09 19:46:45 +01:00
DoctorMacc
da99bb16d5 Cat work 2020-04-09 13:37:27 -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