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.

Sign up for GitHub

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

Fix duplicate key #3

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Fix duplicate key #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
484fee5
Update build script
MuXiu1997 Jun 2, 2022
3033b89
Fix duplicate key
MuXiu1997 May 31, 2022
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
336 changes: 245 additions & 91 deletions build.gradle
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/java/vswe/stevescarts/Upgrades/AssemblerUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public static void init() {



new AssemblerUpgrade(19, "Solar Panel")
new AssemblerUpgrade(19, "Solar Panel Upgrade")
.addEffect(new Solar())
.addRecipe(new Object[][] {
{ComponentTypes.SOLAR_PANEL.getItemStack(), ComponentTypes.SOLAR_PANEL.getItemStack(), ComponentTypes.SOLAR_PANEL.getItemStack()},
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/stevescarts/lang/cs_CZ.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ item.SC2:creative_mode.name=Vylepseni: Podvadeni!
item.SC2:quick_demolisher.name=Vylepseni: Rychly nicitel
item.SC2:manager_bridge.name=Vylepseni: Manazer mostu
item.SC2:entropy.name=Vylepseni: Entropie
item.SC2:solar_panel.name=Vylepseni: Solarni panel
item.SC2:thermal_engine.name=Vylepseni: Termalni motor
item.SC2:solar_panel_upgrade.name=Vylepseni: Solarni panel
item.SC2:thermal_engine_upgrade.name=Vylepseni: Termalni motor

# Detector Units
item.SC2:BlockDetector0.name=Detekovaci manazer
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/cy_GB.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ item.SC2:creative_mode.name=Uwchradd: Dull Creadigol
item.SC2:quick_demolisher.name=Uwchradd: Dymchwelwr Cyflym
item.SC2:manager_bridge.name=Uwchradd: Pont Rheolwr
item.SC2:entropy.name=Upgrade: Entropi
item.SC2:solar_panel.name=Uwchradd: Panel Solar
item.SC2:solar_panel_upgrade.name=Uwchradd: Panel Solar
item.SC2:thermal_engine_upgrade.name=Upgrade: Injân Thermol

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/da_DK.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ item.SC2:creative_mode.name=Upgradering: Kreativ spilletilstand
item.SC2:quick_demolisher.name=Upgradering: Hurtig nedrivning
item.SC2:manager_bridge.name=Upgradering: Bestyrer Bro
item.SC2:entropy.name=Upgradering: Entropi
item.SC2:solar_panel.name=Upgradering: Solpanel
item.SC2:solar_panel_upgrade.name=Upgradering: Solpanel
item.SC2:thermal_engine_upgrade.name=Upgradering: Termisk Moter

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/de_DE.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ item.SC2:creative_mode.name=Upgrade: Kreativmodus
item.SC2:quick_demolisher.name=Upgrade: Schneller Demolierer
item.SC2:manager_bridge.name=Upgrade: Managerbrücke
item.SC2:entropy.name=Upgrade: Entropie
item.SC2:solar_panel.name=Upgrade: Sonnenkollektor
item.SC2:solar_panel_upgrade.name=Upgrade: Sonnenkollektor
item.SC2:thermal_engine_upgrade.name=Upgrade: Wärmekraftmotor

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ item.SC2:creative_mode.name=Upgrade: Creative Mode
item.SC2:quick_demolisher.name=Upgrade: Quick Demolisher
item.SC2:manager_bridge.name=Upgrade: Manager Bridge
item.SC2:entropy.name=Upgrade: Entropy
item.SC2:solar_panel.name=Upgrade: Solar Panel
item.SC2:solar_panel_upgrade.name=Upgrade: Solar Panel
item.SC2:thermal_engine_upgrade.name=Upgrade: Thermal Engine

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/es_AR.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ item.SC2:creative_mode.name=Mejora: Modo creativo
item.SC2:quick_demolisher.name=Mejora: Demoledor rápido
item.SC2:manager_bridge.name=Mejora: Administrador de puentes
item.SC2:entropy.name=Mejora: Entropía
item.SC2:solar_panel.name=Mejora: Panel solar
item.SC2:solar_panel_upgrade.name=Mejora: Panel solar
item.SC2:thermal_engine_upgrade.name=Motor termal

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/fi_FI.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ item.SC2:creative_mode.name=Parannus: Luova Pelimuoto
item.SC2:quick_demolisher.name=Parannus: Nopea Purkaja
item.SC2:manager_bridge.name=Parannus: Hallitsijasilta
item.SC2:entropy.name=Parannus: Entropia
item.SC2:solar_panel.name=Parannus: Aurinkopaneeli
item.SC2:solar_panel_upgrade.name=Parannus: Aurinkopaneeli
item.SC2:thermal_engine_upgrade.name=Parannus: Lämpomoottori

# Detector Units
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/stevescarts/lang/it_IT.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ item.SC2:creative_mode.name=Potenziamento: Modalita' creativa
item.SC2:quick_demolisher.name=Potenziamento: Demolizione rapida
item.SC2:manager_bridge.name=Potenziamento: Ponte gestionale
item.SC2:entropy.name=Potenziamento: Entropia
item.SC2:solar_panel.name=Potenziamento: Pannello solare
item.SC2:thermal_engine.name=Potenziamento: Motore termico
item.SC2:solar_panel_upgrade.name=Potenziamento: Pannello solare
item.SC2:thermal_engine_upgrade.name=Potenziamento: Motore termico

# Detector Units
item.SC2:BlockDetector0.name=Rilevatore primario
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/nl_NL.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ item.SC2:creative_mode.name=Upgrade: Creative Mode
item.SC2:quick_demolisher.name=Upgrade: Snel Sloper
item.SC2:manager_bridge.name=Upgrade: Brug Beheerder
item.SC2:entropy.name=Upgrade: Entropie
item.SC2:solar_panel.name=Upgrade: Zonnepaneel
item.SC2:solar_panel_upgrade.name=Upgrade: Zonnepaneel
item.SC2:thermal_engine_upgrade.name=Upgrade: Thermische Motor

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/no_NO.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ item.SC2:creative_mode.name=Oppgradering: Kreativ modus
item.SC2:quick_demolisher.name=Oppgradering: Rast Nedbryter
item.SC2:manager_bridge.name=Oppgradering: Bestyrerbro
item.SC2:entropy.name=Oppgradering: Entropi
item.SC2:solar_panel.name=Oppgradering: Solcellepanel
item.SC2:solar_panel_upgrade.name=Oppgradering: Solcellepanel
item.SC2:thermal_engine_upgrade.name=Oppgradering: Termisk Motor

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/pt_BR.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ item.SC2:creative_mode.name=Upgrade: Modo Criativo
item.SC2:quick_demolisher.name=Upgrade: Demolidor Rápido
item.SC2:manager_bridge.name=Upgrade: Conexão com o Gerenciador
item.SC2:entropy.name=Upgrade: Entropia
item.SC2:solar_panel.name=Upgrade: Painel Solar
item.SC2:solar_panel_upgrade.name=Upgrade: Painel Solar
item.SC2:thermal_engine_upgrade.name=Upgrade: Motor Térmico

# Detector Units
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/stevescarts/lang/pt_PT.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ item.SC2:creative_mode.name=Upgrade: Modo de jogo creativo
item.SC2:quick_demolisher.name=Upgrade: Demolidor rapido
item.SC2:manager_bridge.name=Upgrade: Gestor de pontes
item.SC2:entropy.name=Upgrade: Entropia
item.SC2:solar_panel.name=Upgrade: Painel Solar
item.SC2:thermal_engine.name=Upgrade: Motor Termico
item.SC2:solar_panel_upgrade.name=Upgrade: Painel Solar
item.SC2:thermal_engine_upgrade.name=Upgrade: Motor Termico

# Detector Units
item.SC2:BlockDetector0.name=Detetor Gestor
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/ru_RU.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ item.SC2:creative_mode.name=Улучшение: Творческий режим
item.SC2:quick_demolisher.name=Улучшение: Быстрый демонтаж
item.SC2:manager_bridge.name=Улучшение: Соединение с распределителем
item.SC2:entropy.name=Улучшение: Энтропия
item.SC2:solar_panel.name=Улучшение: Солнечная батарея
item.SC2:solar_panel_upgrade.name=Улучшение: Солнечная батарея
item.SC2:thermal_engine_upgrade.name=Улучшение: Термальный двигатель

# Detector Units
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/stevescarts/lang/sv_SE.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ item.SC2:creative_mode.name=Uppgradering: kreativt läge
item.SC2:quick_demolisher.name=Uppgradering: snabb demontör
item.SC2:manager_bridge.name=Uppgradering: hanterarbrygga
item.SC2:entropy.name=Uppgradering: entropi
item.SC2:solar_panel.name=Uppgradering: Solpanel
item.SC2:solar_panel_upgrade.name=Uppgradering: Solpanel
item.SC2:thermal_engine_upgrade.name=Uppgradering: termisk motor

# Detector Units
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/stevescarts/lang/zh_CN.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ item.SC2:cleaning_fan.name=清理风扇
item.SC2:cleaning_core.name=清理核心
item.SC2:cleaning_tube.name=清理管道
item.SC2:fuse.name=引信
item.SC2:solar_panel.name=升级：太阳能板
item.SC2:solar_panel.name=太阳能板
item.SC2:eye_of_galgador.name=混合晶化眼
item.SC2:lump_of_galgador.name=混合晶化团
item.SC2:galgadorian_metal.name=混合晶化锭
Expand Down Expand Up @@ -434,7 +434,7 @@ item.SC2:creative_mode.name=升级：创造模式
item.SC2:quick_demolisher.name=升级：快速拆卸器
item.SC2:manager_bridge.name=升级：管理器桥梁
item.SC2:entropy.name=升级：熵
item.SC2:solar_panel.name=升级：太阳能板
item.SC2:solar_panel_upgrade.name=升级：太阳能板
item.SC2:thermal_engine_upgrade.name=升级：热能引擎

# Detector Units
Expand Down