Commit Graph

1420 Commits

Author SHA1 Message Date
Myles
f4b6b1795e
Merge pull request #1085 from Gerrygames/myles_master
fix #1076
2018-11-13 10:05:09 +00:00
Gerrygames
b86950d0e7 fix #1076 2018-11-13 10:59:11 +01:00
Myles
7f77cbfd74
Merge pull request #1081 from creeper123123321/master
Use less ram on translation mappings
2018-11-12 16:45:19 +00:00
creeper123123321
cfd3179cb8
try to eat less ram 2018-11-11 11:57:33 -02:00
Myles
1a3170c7db
Merge pull request #1077 from creeper123123321/translations
Translation rewriting
2018-11-10 10:45:21 +00:00
Myles
25463a929a
Merge pull request #1078 from creeper123123321/master
fix set cooldown
2018-11-10 10:44:34 +00:00
creeper123123321
408bd49120
fix set cooldown 2018-11-10 08:41:22 -02:00
creeper123123321
3fc2d28b95
fix npe 2018-11-08 16:18:20 -02:00
creeper123123321
d9eff7bb5c
Translation rewriting 2018-11-08 16:11:01 -02:00
Myles
d84c4365c9
Merge pull request #1069 from creeper123123321/master
color rewriting changes
2018-11-04 13:08:10 +00:00
creeper123123321
bec27e0fa6
Use ChatColor.COLOR_CHAR 2018-11-04 10:51:29 -02:00
creeper123123321
437b02c961
color rewriting changes 2018-11-04 08:56:22 -02:00
Myles
e6922eae46 Don't use -1 if provided by ProtocolDetectorService on Bungee #1064 2018-11-01 22:41:56 +00:00
Myles
b9750be745
Merge pull request #1066 from creeper123123321/master
Tolerate some identifiers. Should fix #1063
2018-11-01 15:58:31 +00:00
creeper123123321
b7606aece0
Tolerate some identifiers. Should fix #1063 2018-10-31 16:26:55 -03:00
Myles
78aefa936f
Minor bug report typo 2018-10-28 16:38:53 +00:00
Myles
2c18adf202
Delete ISSUE_TEMPLATE.md 2018-10-28 16:38:08 +00:00
Myles
083f401ee5 Update issue templates 2018-10-28 16:30:26 +00:00
Myles
58efd6158f Back to SNAPSHOT 2018-10-22 17:45:17 +01:00
Myles
99bd1a52fb 1.13.2 update 2018-10-22 17:42:53 +01:00
Myles
8ba1725eae
Merge pull request #1055 from Gerrygames/1.13.2
1.13.2
2018-10-22 17:35:25 +01:00
Myles
0a2524fec8
Merge pull request #1054 from Gerrygames/myles_master
fix #1052
2018-10-22 17:35:07 +01:00
Gerrygames
162d6aa33a 1.13.2 support 2018-10-22 15:18:23 +02:00
Gerrygames
fdcdd0fe40 Merge remote-tracking branch 'Myles/master' into 1.13.2 2018-10-22 15:18:06 +02:00
Gerrygames
8532d388f8 fix #1052 2018-10-22 14:33:38 +02:00
Myles
ccc144556b
Merge pull request #1053 from Gerrygames/book_fix
fix #1044
2018-10-22 12:10:34 +01:00
Gerrygames
0b7e438128 fix #1044 2018-10-22 11:29:22 +02:00
Myles
2f11268dcc
Merge pull request #1050 from Plancke/master
Fix scoreboard colors
2018-10-21 23:11:09 +01:00
Plancke
81514e4192 convert every color in the name 2018-10-21 23:19:54 +02:00
Plancke
7d5c59aa34 Don't read the array size 2018-10-21 23:06:24 +02:00
Plancke
dc6d9367b0 Rewrite scoreboard team member names to fix the color changing 2018-10-21 22:56:11 +02:00
Myles
6c609a6b23
Merge pull request #1049 from Gerrygames/1.13.2
1.13.2-pre2 support
2018-10-20 10:32:02 +01:00
Gerrygames
b7a3c8568f 1.13.2-pre2 support 2018-10-20 11:25:20 +02:00
Myles
80f84d4001
Merge pull request #1048 from Gerrygames/1.13.2
1.13.2
2018-10-17 16:21:53 +01:00
Gerrygames
5cecfd14d9 1.13.2-pre1 support 2018-10-17 15:38:59 +02:00
Myles
8bfcc550f7
Merge pull request #1036 from KennyTV/master
Remove some more unncessary/doubled map check
2018-10-03 17:12:47 +01:00
KennyTV
e40be243de Return correct default protocol, whoops! 2018-10-03 10:12:13 +02:00
KennyTV
033d3bcd4d Remove some more unncessary/doubled map check 2018-09-30 21:19:18 +02:00
KennyTV
449ec15309 Remove unncessary/doubled map check 2018-09-30 20:48:23 +02:00
Myles
8b0ccd81e2
Merge pull request #1035 from KennyTV/master
Remove unncessary doubled map check
2018-09-30 16:16:51 +01:00
KennyTV
a206fd7541 Remove unncessary doubled map check 2018-09-30 16:07:08 +02:00
Myles
77472cb9f4 Back to snapshot 2018-09-24 11:39:14 +01:00
Myles
5372d4b8e7 1.5.2 release 2018-09-24 11:33:20 +01:00
Myles
0255f3c42f
Merge pull request #1030 from creeper123123321/master
Fix PacketWrapper#constructPacket
2018-09-24 08:44:14 +01:00
creeper123123321
eb5c10d375
Fix PacketWrapper#constructPacket 2018-09-24 03:42:08 -03:00
Myles
9f6766fb82 Back to 1.5.2-SNAPSHOT 2018-09-23 19:28:07 +01:00
Myles
ab77eb98c0 Prepare for 1.5.1 release 2018-09-23 18:54:24 +01:00
Myles
85ab5d7741 Use Channel instead of SocketChannel
For better compatibility with third party software.
2018-09-23 18:52:26 +01:00
Myles
6457ff315f Merge branch 'pr/987' 2018-09-23 18:43:29 +01:00
Myles
c09a9c88b4
Merge pull request #1005 from creeper123123321/sendpackettoserver
PacketWrapper#sendToServer changes
2018-09-23 18:18:00 +01:00