Skip to content

Commit fcb5155

Browse files
Phoenixvine32908Phoenixvine32908
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # src/generated/resources/assets/gtmutils/lang/en_ud.json # src/generated/resources/assets/gtmutils/lang/en_us.json # src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java # src/main/java/net/neganote/gtutilities/common/machine/singleblock/AutoChargerMachine.java # src/main/java/net/neganote/gtutilities/config/UtilConfig.java
2 parents d13bbfa + 4bf52c4 commit fcb5155

20 files changed

+391
-7
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ A GregTech Modern addon, adding some nice quality-of-life features.
44
Current features:
55

66
* A Sterile Cleaning Maintenance Hatch
7-
* An omni-breaker, a tool that can break anything instantly like a modern Vajra
7+
* An omni-breaker, a tool that can break anything instantly like a modern Vajra (a standalone FE-based version of which is available [here](https://github.com/NegaNote/Omnibreaker/))
88
* 64A Energy Converters
9+
* Turbo Chargers that can additionally auto-output fully-charged batteries/tools
910
* The Wireless Active Transformer (WAT)
1011
* Has an opt-in coolant system, where the WAT requires coolant to be used, or it'll explode (or just stop if GTm is set to have harmless active transformers)
1112

‎changelog.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# GregTech Modern Utilities version 2.4.0
1+
# GregTech Modern Utilities version 2.5.0
22

3-
* Update to GTm 7.3.0
4-
* Revert addition of config for parallel hatches starting at max parallels, as this is now always the case in base GTm
3+
* Update to GTm 7.4.0
4+
* Add turbo-chargers with the ability to auto-output full batteries, courtesy of Phoenixvine (off by default)

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
1111
mapping_version=2023.09.03
1212

1313
# Mod Properties
14-
mod_version=2.4.0
14+
mod_version=2.5.0
1515
maven_group=net.neganote.gtmutils
1616
archives_base_name=gtmutils
1717
mod_id=gtmutils
@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1G
2323
# Dependencies
2424
appeng_version=15.0.18
2525
architectury_version=9.2.14
26-
gtceu_version=7.3.0
26+
gtceu_version=7.4.0
2727
ldlib_version=1.0.40.b
2828
registrate_version=MC1.20-1.3.11
2929
rhino_version=2001.2.3-build.6

‎src/generated/resources/assets/gtmutils/blockstates/opv_auto_charger_4x.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtmutils:block/machine/opv_auto_charger_4x",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/opv_auto_charger_4x",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/opv_auto_charger_4x"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/opv_auto_charger_4x",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/opv_auto_charger_4x",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/opv_auto_charger_4x",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/uev_auto_charger_4x.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtmutils:block/machine/uev_auto_charger_4x",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/uev_auto_charger_4x",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/uev_auto_charger_4x"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/uev_auto_charger_4x",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/uev_auto_charger_4x",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/uev_auto_charger_4x",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/uiv_auto_charger_4x.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtmutils:block/machine/uiv_auto_charger_4x",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/uiv_auto_charger_4x",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/uiv_auto_charger_4x"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/uiv_auto_charger_4x",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/uiv_auto_charger_4x",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/uiv_auto_charger_4x",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/ulv_auto_charger_4x.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtmutils:block/machine/ulv_auto_charger_4x",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/ulv_auto_charger_4x",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/ulv_auto_charger_4x"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/ulv_auto_charger_4x",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/ulv_auto_charger_4x",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/ulv_auto_charger_4x",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/uxv_auto_charger_4x.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtmutils:block/machine/uxv_auto_charger_4x",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/uxv_auto_charger_4x",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/uxv_auto_charger_4x"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/uxv_auto_charger_4x",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/uxv_auto_charger_4x",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/uxv_auto_charger_4x",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/models/block/machine/opv_auto_charger_4x.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtmutils:opv_auto_charger_4x",
5+
"variants": {
6+
"charger_state=finished": {
7+
"model": {
8+
"parent": "gtceu:block/machine/template/sided/sided",
9+
"textures": {
10+
"bottom": "gtceu:block/casings/voltage/opv/bottom",
11+
"overlay_front": "gtceu:block/machines/charger/overlay_charger_finished",
12+
"overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_finished_emissive",
13+
"side": "gtceu:block/casings/voltage/opv/side",
14+
"top": "gtceu:block/casings/voltage/opv/top"
15+
}
16+
}
17+
},
18+
"charger_state=idle": {
19+
"model": {
20+
"parent": "gtceu:block/machine/template/sided/sided",
21+
"textures": {
22+
"bottom": "gtceu:block/casings/voltage/opv/bottom",
23+
"overlay_front": "gtceu:block/machines/charger/overlay_charger_idle",
24+
"side": "gtceu:block/casings/voltage/opv/side",
25+
"top": "gtceu:block/casings/voltage/opv/top"
26+
}
27+
}
28+
},
29+
"charger_state=running": {
30+
"model": {
31+
"parent": "gtceu:block/machine/template/sided/sided",
32+
"textures": {
33+
"bottom": "gtceu:block/casings/voltage/opv/bottom",
34+
"overlay_front": "gtceu:block/machines/charger/overlay_charger_running",
35+
"overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_running_emissive",
36+
"side": "gtceu:block/casings/voltage/opv/side",
37+
"top": "gtceu:block/casings/voltage/opv/top"
38+
}
39+
}
40+
}
41+
}
42+
}

‎src/generated/resources/assets/gtmutils/models/block/machine/uev_auto_charger_4x.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtmutils:uev_auto_charger_4x",
5+
"variants": {
6+
"charger_state=finished": {
7+
"model": {
8+
"parent": "gtceu:block/machine/template/sided/sided",
9+
"textures": {
10+
"bottom": "gtceu:block/casings/voltage/uev/bottom",
11+
"overlay_front": "gtceu:block/machines/charger/overlay_charger_finished",
12+
"overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_finished_emissive",
13+
"side": "gtceu:block/casings/voltage/uev/side",
14+
"top": "gtceu:block/casings/voltage/uev/top"
15+
}
16+
}
17+
},
18+
"charger_state=idle": {
19+
"model": {
20+
"parent": "gtceu:block/machine/template/sided/sided",
21+
"textures": {
22+
"bottom": "gtceu:block/casings/voltage/uev/bottom",
23+
"overlay_front": "gtceu:block/machines/charger/overlay_charger_idle",
24+
"side": "gtceu:block/casings/voltage/uev/side",
25+
"top": "gtceu:block/casings/voltage/uev/top"
26+
}
27+
}
28+
},
29+
"charger_state=running": {
30+
"model": {
31+
"parent": "gtceu:block/machine/template/sided/sided",
32+
"textures": {
33+
"bottom": "gtceu:block/casings/voltage/uev/bottom",
34+
"overlay_front": "gtceu:block/machines/charger/overlay_charger_running",
35+
"overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_running_emissive",
36+
"side": "gtceu:block/casings/voltage/uev/side",
37+
"top": "gtceu:block/casings/voltage/uev/top"
38+
}
39+
}
40+
}
41+
}
42+
}

0 commit comments

Comments
 (0)