Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

March release #741

Merged
merged 61 commits into from
Mar 26, 2023
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
29f488b
Fix sidebar title animation not working #660
tomkeuper Feb 6, 2023
83162e1
Fixed wins placeholder not in lobby sidebar #658
tomkeuper Feb 8, 2023
1db9bd7
Fixed NPE when clicking outside of shop inventory #664
tomkeuper Feb 8, 2023
36b3a70
Fixed command error when lobby location is not set
tomkeuper Feb 8, 2023
f54c201
Added unformatted player name to kill message and bed destroy
tomkeuper Feb 9, 2023
a056d04
Added Netherite armor to 1.16+ (#657)
tomkeuper Feb 11, 2023
b7c75d2
Added missing items in v1_12_R1
tomkeuper Feb 11, 2023
bd5df96
Fixed level just showing numer (#661)
tomkeuper Feb 12, 2023
403f474
Merge pull request #667 from andrei1058/fixes
andrei1058 Feb 12, 2023
ed86ef3
expose sidebar on API
andrei1058 Feb 16, 2023
033ede1
a few updates (#632)
Xxyuri2005xX Feb 16, 2023
2d015f7
add sidebar init event
andrei1058 Feb 17, 2023
e73eab6
Merge remote-tracking branch 'origin/master'
andrei1058 Feb 17, 2023
e244413
fix team identifier length (#682)
andrei1058 Feb 25, 2023
9d2f1ad
Bug fixes and placeholder adjustments (#685)
tomkeuper Feb 26, 2023
3ccb3b9
fix no tab formatting for first player (#692)
tomkeuper Feb 28, 2023
30a393c
fix losing permanent items on rejoin (#385)
tomkeuper Mar 1, 2023
5a0b5be
fix scoreboard getting send twice (#690)
tomkeuper Mar 3, 2023
975e3ed
fix void tp on newer servers
tomkeuper Mar 3, 2023
8b8bd87
fix swords disappearing (#686)
tomkeuper Mar 4, 2023
f511c1b
fix invisibility potion compatibility with 1.8.8
andrei1058 Mar 5, 2023
abb6ba9
fix lobby tablist (#701)
tomkeuper Mar 5, 2023
cccae7a
Merge pull request #704 from andrei1058/issue-688
tomkeuper Mar 5, 2023
ba5e310
Add translation for Simplified Chinese (#628)
skbeh Mar 6, 2023
f7e6257
Remove hand from hideArmor
tomkeuper Mar 7, 2023
07979b0
fix placeholders
tomkeuper Mar 7, 2023
8f08acb
Fix elapsed time always null (#574)
tomkeuper Mar 7, 2023
2c3f7a2
fix header and footer
andrei1058 Mar 11, 2023
7a63f59
clean up
andrei1058 Mar 11, 2023
8ce841d
should fix #699
andrei1058 Mar 11, 2023
5403206
Merge branch 'master' into issue-688
andrei1058 Mar 11, 2023
93ed9d4
Remove Deprecation Warning for Version and Update getServerVersion Me…
JT122406 Mar 11, 2023
bbb6f40
Merge branch 'master' into issue-688
andrei1058 Mar 11, 2023
c86aadf
fix #712
andrei1058 Mar 12, 2023
692ee73
Add user texture to player head (#333)
tomkeuper Mar 16, 2023
4e4e3a7
Merge branch 'bug-fixes' into issue-688
tomkeuper Mar 16, 2023
a99f3ae
Merge pull request #718 from andrei1058/issue-688
tomkeuper Mar 16, 2023
da0a951
Add gamesPlayed placeholder
tomkeuper Mar 16, 2023
efa392c
Fixed placeholder typos
tomkeuper Mar 18, 2023
f9365d5
remove unnecessary teams
tomkeuper Mar 19, 2023
bf0306d
fix placeholder
tomkeuper Mar 20, 2023
52f4e63
Merge remote-tracking branch 'origin/bug-fixes' into bug-fixes
tomkeuper Mar 21, 2023
d30fbbc
fix player name invisible on 1.8
tomkeuper Mar 22, 2023
785386b
removed replace gens with air (#529)
tomkeuper Mar 24, 2023
d7a874a
add check if respawning (#732)
tomkeuper Mar 24, 2023
5dd6a68
Add catch for teleport exceptions
tomkeuper Mar 24, 2023
6856c33
Add global placeholders
tomkeuper Mar 24, 2023
a9d1f7e
Add global placeholders to header and footer (#730)
tomkeuper Mar 24, 2023
f5c75f0
Add invis removed message
tomkeuper Mar 25, 2023
60562a7
Merge remote-tracking branch 'origin/bug-fixes' into bug-fixes
tomkeuper Mar 25, 2023
9f02570
fix papi support
andrei1058 Mar 26, 2023
ecd1abb
keep old placeholder at least for a few updates
andrei1058 Mar 26, 2023
df2a3cd
Bug fixes (#740)
tomkeuper Mar 26, 2023
f150a3e
clean up
andrei1058 Mar 26, 2023
ba7ea3d
Merge remote-tracking branch 'origin/master'
andrei1058 Mar 26, 2023
043bd19
Internal Party Additions (Promote, list/info commands) (#715)
JT122406 Mar 26, 2023
812efc1
Update Russian.java (#696)
werxqq0 Mar 26, 2023
d9a6a21
add missing return
andrei1058 Mar 26, 2023
20d7ecc
Merge branch 'production' into master
andrei1058 Mar 26, 2023
bc6abf5
Merge branch 'production'
andrei1058 Mar 26, 2023
d9a318d
Merge remote-tracking branch 'origin/master'
andrei1058 Mar 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix placeholders
tomkeuper committed Mar 7, 2023

Verified

This commit was signed with the committer’s verified signature.
tomkeuper MrCeasar
commit 07979b047be56360b01500e27713f84e1fd11a3b
Original file line number Diff line number Diff line change
@@ -534,7 +534,7 @@ public Spanish() {
Arrays.asList("&7Tu equipo recibira", "&7Afilado I en espadas", "&7y hachas!", "", "{tier_1_color}Precio: &b{tier_1_cost} {tier_1_currency}", ""));
yml.addDefault(Messages.UPGRADES_UPGRADE_TIER_ITEM_NAME.replace("{name}", "armor").replace("{tier}", "tier-1"), "{color}Armadura Reforzada I");
yml.addDefault(Messages.UPGRADES_UPGRADE_TIER_ITEM_LORE.replace("{name}", "armor"),
Arrays.asList("&7Tu equipo recibira", "&7proteccion permanente!", "", "{tier_ _color}Nivel 1: Proteccion I, &b{tier_ _cost} {tier_ _currency}",
Arrays.asList("&7Tu equipo recibira", "&7proteccion permanente!", "", "{tier_1_color}Nivel 1: Proteccion I, &b{tier_1_cost} {tier_1_currency}",
"{tier_2_color}Nivel 2: Proteccion II, &b{tier_2_cost} {tier_2_currency}s",
"{tier_3_color}Nivel 3: Proteccion III, &b{tier_3_cost} {tier_3_currency}",
"{tier_4_color}Nivel 4: Proteccion IV, &b{tier_4_cost} {tier_4_currency}", ""));