Skip to content

Commit a81a524

Browse files
MichaelHillcoxMichaelHillcox
committed
Merge branch 'mc/1.20.1'
2 parents ae2fe60 + 3e925d9 commit a81a524

File tree

10 files changed

+53
-39
lines changed

10 files changed

+53
-39
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
### [1.15.5]
88

9+
#### Added
10+
11+
- Creative energy upgrade. Thanks to [#197](https://github.com/Direwolf20-MC/MiningGadgets/pull/197) [@Anoyomouse](https://github.com/Anoyomouse)
12+
- Portuguese (Brazil) translations. Thanks to [#211](https://github.com/Direwolf20-MC/MiningGadgets/pull/211) [@3AAndreAugustoDev](https://github.com/AndreAugustoDev)
13+
- French translations. Thanks to [#171](https://github.com/Direwolf20-MC/MiningGadgets/pull/171) [@dadobug1111](https://github.com/dadobug1111)
14+
915
#### Fixed
1016

1117
- 3x3 upgrades will no longer disappear from the gadget after updating from `1.15.3` or earlier. Thanks to [#227](https://github.com/Direwolf20-MC/MiningGadgets/pull/227) [@Anoyomouse](https://github.com/Anoyomouse)

‎build.gradle

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'eclipse'
66
id 'maven-publish'
77
id 'net.neoforged.gradle' version '[6.0.18,6.2)'
8-
id "me.modmuss50.mod-publish-plugin" version "0.3.4"
8+
id "me.modmuss50.mod-publish-plugin" version "0.3.5"
99
}
1010

1111
apply {
@@ -85,6 +85,9 @@ repositories {
8585
includeGroup("mezz.jei")
8686
}
8787
}
88+
89+
maven { url = "https://maven.architectury.dev" }
90+
8891
maven {
8992
url "https://www.cursemaven.com"
9093
content {
@@ -115,8 +118,9 @@ dependencies {
115118

116119
// runtimeOnly fg.deobf("curse.maven:inventory-tweaks-renewed:3102237")
117120
// runtimeOnly fg.deobf("curse.maven:lollipop-347954:3232534")
118-
// runtimeOnly fg.deobf("curse.maven:powah-352656:352656")
119121
// runtimeOnly fg.deobf("curse.maven:mekanism-268560:268560")
122+
123+
runtimeOnly fg.deobf("curse.maven:charging-gadgets-399757:4617304")
120124
}
121125

122126
processResources {
@@ -138,12 +142,15 @@ processResources {
138142
def jsonBytesSaved = 0
139143

140144
fileTree(dir: outputs.files.asPath, include: '**/*.json').each {
141-
142145
File file = it
143146
jsonMinified++
144147
def oldLength = file.length()
145-
file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
146-
jsonBytesSaved += oldLength - file.length()
148+
try {
149+
file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
150+
jsonBytesSaved += oldLength - file.length()
151+
} catch (Exception e) {
152+
println('Failed to minify ' + it + ' ' + e)
153+
}
147154
}
148155

149156
println('Minified ' + jsonMinified + ' json files. Saved ' + jsonBytesSaved + ' bytes. Took ' + (System.currentTimeMillis() - jsonMinifyStart) + 'ms.')

‎src/generated/resources/.cache/2e50376a258ceefdeaf48c21f919aaa551c1fbe8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// 1.20.1 2023-10-03T15:56:54.8095774 Item Models
1+
// 1.20.1 2023-10-20T21:43:10.440018 Item Models
22
8da37fe8fa2b785fbf0633e3d25dfc8502305df3 assets/mininggadgets/models/item/minerslight.json
33
6e083fdcfbbe3ace1ce88136cfe9d68bf07c5490 assets/mininggadgets/models/item/modificationtable.json
44
00d58751e2423f4999a59ca9019b15100de3da1b assets/mininggadgets/models/item/upgrade_battery_1.json
55
5b7cbf3ad35790168c87ca770fa22158436459f0 assets/mininggadgets/models/item/upgrade_battery_2.json
66
bbf2e8b8b73bdecaa471e48bde4064c6f165106a assets/mininggadgets/models/item/upgrade_battery_3.json
7+
7554d06952f0b2d0fa9d205b76a557575a8a3281 assets/mininggadgets/models/item/upgrade_battery_creative.json
78
58815a83891b831ec777b939d77ebc1ec3b83777 assets/mininggadgets/models/item/upgrade_efficiency_1.json
89
f6c8071ed2b64977071d63b1a4d9e6803ff0cff1 assets/mininggadgets/models/item/upgrade_efficiency_2.json
910
4423e551abeb76abb309020a89ee44fa0871f00c assets/mininggadgets/models/item/upgrade_efficiency_3.json

‎src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.1 2023-10-04T07:31:05.1284504 Languages: en_us
2-
f6d17f678d0ba472524e8542e691c4b1213a5c2f assets/mininggadgets/lang/en_us.json
1+
// 1.20.1 2023-10-20T21:43:10.442003 Languages: en_us
2+
a1982468138e260a4be9f9a5878c9f19ea7bc2da assets/mininggadgets/lang/en_us.json

‎src/generated/resources/assets/mininggadgets/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"item.mininggadgets.upgrade_battery_1": "Upgrade: Battery, Tier 1",
1010
"item.mininggadgets.upgrade_battery_2": "Upgrade: Battery, Tier 2",
1111
"item.mininggadgets.upgrade_battery_3": "Upgrade: Battery, Tier 3",
12-
"item.mininggadgets.upgrade_battery_creative": "Upgrade: Battery, Creative",
12+
"item.mininggadgets.upgrade_battery_creative": "Upgrade: Creative Battery",
1313
"item.mininggadgets.upgrade_efficiency_1": "Upgrade: Efficiency, Tier 1",
1414
"item.mininggadgets.upgrade_efficiency_2": "Upgrade: Efficiency, Tier 2",
1515
"item.mininggadgets.upgrade_efficiency_3": "Upgrade: Efficiency, Tier 3",

‎src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/Upgrade.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public enum Upgrade {
4343
BATTERY_1("battery_1", ModItems.BATTERY_1, 1, () -> 0),
4444
BATTERY_2("battery_2", ModItems.BATTERY_2, 2, () -> 0),
4545
BATTERY_3("battery_3", ModItems.BATTERY_3, 3, () -> 0),
46-
BATTERY_CREATIVE("battery_CREATIVE", ModItems.BATTERY_CREATIVE, 4, () -> 0),
46+
BATTERY_CREATIVE("battery_creative", ModItems.BATTERY_CREATIVE, 4, () -> 0),
4747

4848
RANGE_1("range_1", ModItems.RANGE_1, 1, () -> 0),
4949
RANGE_2("range_2", ModItems.RANGE_2, 2, () -> 0),
@@ -115,7 +115,7 @@ public String getLocal() {
115115
public String getLocalReplacement() {
116116
return MiningGadgets.MOD_ID + ".upgrade.replacement";
117117
}
118-
118+
119119
public boolean hasTier() {
120120
return tier != -1;
121121
}

‎src/main/resources/assets/mininggadgets/lang/fr_fr.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
"item.mininggadgets.mininggadget": "Gadget minier MK3",
77
"item.mininggadgets.mininggadget_fancy": "Gadget minier MK2",
88
"item.mininggadgets.mininggadget_simple": "Gadget minier MK1",
9-
"item.mininggadgets.upgrade_battery_1": "Mise à niveau : Batterie, Niveau 1",
10-
"item.mininggadgets.upgrade_battery_2": "Mise à niveau : Batterie, Niveau 2",
11-
"item.mininggadgets.upgrade_battery_3": "Mise à niveau : Batterie, Niveau 3",
12-
"item.mininggadgets.upgrade_efficiency_1": "Mise à niveau : Efficacité, Niveau 1",
13-
"item.mininggadgets.upgrade_efficiency_2": "Mise à niveau : Efficacité, Niveau 2",
14-
"item.mininggadgets.upgrade_efficiency_3": "Mise à niveau : Efficacité, Niveau 3",
15-
"item.mininggadgets.upgrade_efficiency_4": "Mise à niveau : Efficacité, Niveau 4",
16-
"item.mininggadgets.upgrade_efficiency_5": "Mise à niveau : Efficacité, Niveau 5",
9+
"item.mininggadgets.upgrade_battery_1": "Mise à niveau: Batterie, Niveau 1",
10+
"item.mininggadgets.upgrade_battery_2": "Mise à niveau: Batterie, Niveau 2",
11+
"item.mininggadgets.upgrade_battery_3": "Mise à niveau: Batterie, Niveau 3",
12+
"item.mininggadgets.upgrade_efficiency_1": "Mise à niveau: Efficacité, Niveau 1",
13+
"item.mininggadgets.upgrade_efficiency_2": "Mise à niveau: Efficacité, Niveau 2",
14+
"item.mininggadgets.upgrade_efficiency_3": "Mise à niveau: Efficacité, Niveau 3",
15+
"item.mininggadgets.upgrade_efficiency_4": "Mise à niveau: Efficacité, Niveau 4",
16+
"item.mininggadgets.upgrade_efficiency_5": "Mise à niveau: Efficacité, Niveau 5",
1717
"item.mininggadgets.upgrade_empty": "Module de mise à niveau vierge",
18-
"item.mininggadgets.upgrade_fortune_1": "Mise à niveau : Fortune, Niveau 1",
19-
"item.mininggadgets.upgrade_fortune_2": "Mise à niveau : Fortune, Niveau 2",
20-
"item.mininggadgets.upgrade_fortune_3": "Mise à niveau : Fortune, Niveau 3",
21-
"item.mininggadgets.upgrade_freezing": "Mise à niveau : Geler",
22-
"item.mininggadgets.upgrade_light_placer": "Mise à niveau : Placeur de lumière",
23-
"item.mininggadgets.upgrade_magnet": "Mise à niveau : Aimant",
24-
"item.mininggadgets.upgrade_range_1": "Mise à niveau : Portée, Niveau 1",
25-
"item.mininggadgets.upgrade_range_2": "Mise à niveau : Portée, Niveau 2",
26-
"item.mininggadgets.upgrade_range_3": "Mise à niveau : Portée, Niveau 3",
27-
"item.mininggadgets.upgrade_silk": "Mise à niveau : Toucher de soie",
28-
"item.mininggadgets.upgrade_three_by_three": "Mise à niveau : 3x3",
29-
"item.mininggadgets.upgrade_void_junk": "Mise à niveau : Poubelle du vide",
18+
"item.mininggadgets.upgrade_fortune_1": "Mise à niveau: Fortune, Niveau 1",
19+
"item.mininggadgets.upgrade_fortune_2": "Mise à niveau: Fortune, Niveau 2",
20+
"item.mininggadgets.upgrade_fortune_3": "Mise à niveau: Fortune, Niveau 3",
21+
"item.mininggadgets.upgrade_freezing": "Mise à niveau: Geler",
22+
"item.mininggadgets.upgrade_light_placer": "Mise à niveau: Placeur de lumière",
23+
"item.mininggadgets.upgrade_magnet": "Mise à niveau: Aimant",
24+
"item.mininggadgets.upgrade_range_1": "Mise à niveau: Portée, Niveau 1",
25+
"item.mininggadgets.upgrade_range_2": "Mise à niveau: Portée, Niveau 2",
26+
"item.mininggadgets.upgrade_range_3": "Mise à niveau: Portée, Niveau 3",
27+
"item.mininggadgets.upgrade_silk": "Mise à niveau: Toucher de soie",
28+
"item.mininggadgets.upgrade_size_1": "Mise à niveau: 3x3",
29+
"item.mininggadgets.upgrade_void_junk": "Mise à niveau: Poubelle du vide",
3030
"itemGroup.mininggadgets": "Gadgets miniers",
3131
"mininggadgets.gadget.energy": "Énergie : %d/%d",
3232
"mininggadgets.gadget.range_change": "Changement de portée: %1$d x %1$d",
33-
"mininggadgets.text.empty_table_helper": "Maj-cliquez pour insérer à partir de vos emplacements\nou déposez la mise à niveau sur cet écran.\on\onCliquez sur la mise à niveau pour supprimer.",
33+
"mininggadgets.text.empty_table_helper": "Maj-cliquez pour insérer à partir de vos emplacements\nou déposez la mise à niveau sur cet écran. Cliquez sur la mise à niveau pour supprimer.",
3434
"mininggadgets.text.modification_table": "Tableau des modifications",
3535
"mininggadgets.text.open_gui": "Ouvrir les paramètres du gadget minier",
3636
"mininggadgets.tooltip.item.battery_boost": "Boost de batterie : %1$d",
@@ -65,7 +65,7 @@
6565
"mininggadgets.tooltip.screen.whitelist": "Liste blanche active",
6666
"mininggadgets.tooltip.single.filters": "Filtres",
6767
"mininggadgets.tooltip.single.insert": "Insérer",
68-
"mininggadgets.upgrade.replacement": "Mise à niveau : ",
68+
"mininggadgets.upgrade.replacement": "Mise à niveau: ",
6969
"tooltop.mininggadgets.battery": "Améliore les condensateurs internes",
7070
"tooltop.mininggadgets.efficiency": "Applique efficacité au gadget minier",
7171
"tooltop.mininggadgets.empty": "Utilisé pour fabriquer d'autres améliorations",
@@ -77,5 +77,5 @@
7777
"tooltop.mininggadgets.range": "Prolonge votre portée de 5 fois avec chaque niveau",
7878
"tooltop.mininggadgets.silk": "Applique l'enchantement toucher soie au gadget minier",
7979
"tooltop.mininggadgets.three_by_three": "Permet un rayon minier de 3x3",
80-
"tooltop.mininggadgets.void_junk": "Désintègre les blocs ! (ajoute également un filtrage)"
81-
}
80+
"tooltop.mininggadgets.void_junk": "Désintègre les blocs! (ajoute également un filtrage)"
81+
}

‎src/main/resources/assets/mininggadgets/lang/pt_br.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"item.mininggadgets.upgrade_range_2": "Atualização: Alcance, nível 2",
2626
"item.mininggadgets.upgrade_range_3": "Atualização: Alcance, nível 3",
2727
"item.mininggadgets.upgrade_silk": "Atualização: Toque suave",
28-
"item.mininggadgets.upgrade_three_by_three": "Atualização: 3x3",
28+
"item.mininggadgets.upgrade_size_1": "Atualização: 3x3",
2929
"item.mininggadgets.upgrade_void_junk": "Atualização: Lixeira",
3030
"itemGroup.mininggadgets": "Dispositivos de mineração",
3131
"mininggadgets.gadget.energy": "Energia: %d/%d",
@@ -78,4 +78,4 @@
7878
"tooltop.mininggadgets.silk": "Aplica toque suave ao dispositivo de mineração",
7979
"tooltop.mininggadgets.three_by_three": "Permite um raio de mineração de 3x3",
8080
"tooltop.mininggadgets.void_junk": "Elimina blocos! (também adiciona filtragem)"
81-
}
81+
}

‎src/main/resources/assets/mininggadgets/lang/ru_ru.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"item.mininggadgets.upgrade_range_2": "Улучшение: Дальность, Уровень 2",
2424
"item.mininggadgets.upgrade_range_3": "Улучшение: Дальность, Уровень 3",
2525
"item.mininggadgets.upgrade_silk": "Улучшение: Шелковое касание",
26-
"item.mininggadgets.upgrade_three_by_three": "Улучшение: 3x3",
26+
"item.mininggadgets.upgrade_size_1": "Улучшение: 3x3",
2727
"item.mininggadgets.upgrade_void_junk": "Улучшение: Пустотная мусорка",
2828
"itemGroup.mininggadgets": "Mining Gadgets",
2929
"mininggadgets.gadget.energy": "Энергия: %d/%d",

‎src/main/resources/assets/mininggadgets/lang/zh_tw.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"item.mininggadgets.upgrade_range_2":"升級：範圍，二級",
2424
"item.mininggadgets.upgrade_range_3":"升級：範圍，三級",
2525
"item.mininggadgets.upgrade_silk":"升級：絲綢之觸",
26-
"item.mininggadgets.upgrade_three_by_three":"升級：3x3",
26+
"item.mininggadgets.upgrade_size_1":"升級：3x3",
2727
"item.mininggadgets.upgrade_void_junk":"升級：虛空垃圾",
2828
"itemGroup.mininggadgets":"採礦小工具",
2929
"mininggadgets.gadget.energy":"能源： %d/%d",

0 commit comments

Comments
 (0)