Skip to content

Commit 87f62b3

Browse files
NegaNoteNegaNote
authored
Merge pull request #13 from NegaNote/port-to-1.7.0
Port to 7.0.0
2 parents 56ec497 + 6a72e30 commit 87f62b3

File tree

71 files changed

+1432
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1432
-322
lines changed

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
curseforge-id: ${{ vars.CURSE_ID }}
5757
curseforge-token: ${{ secrets.CURSE_TOKEN }}
5858

59+
modrinth-id: ${{ vars.MODRINTH_ID }}
60+
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
61+
5962
github-token: ${{ secrets.GITHUB_TOKEN }}
6063
github-generate-changelog: true
6164
github-tag: "1.20.1-${{ steps.gradle_properties.outputs.mod_version }}"

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ 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, that can break anything instantly
7+
* An omni-breaker, a tool that can break anything instantly like a modern Vajra
88
* 64A Energy Converters
9-
* The Power Transfer Einstein-Rosen Bridge (PTERB), a wireless version of the Active Transformer
10-
* Has an opt-in coolant system, where the PTERB requires coolant to be used, or it'll explode (or just stop if GTm is set to have harmless active transformers)
9+
* The Wireless Active Transformer (WAT)
10+
* 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)
1111

1212
All features can be enabled or disabled in the config.
1313

1414
While this mod was originally created for Monifactory, feel free to use it in any GregTech modpack you like!
1515

16-
All features (except for the sterile cleaning hatch and optional coolant for the PTERB) have default recipes.
16+
All features (except for the sterile cleaning hatch and optional coolant for the WAT) have default recipes.
1717
Feel free to change recipes in your own pack!
1818

1919
## License

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ repositories {
2929
url "https://maven.firstdarkdev.xyz/snapshots/"
3030
}
3131
maven {
32+
3233
// latvian.dev Maven (KubeJS and Rhino)
3334
url = "https://maven.latvian.dev/releases"
3435
}
@@ -102,6 +103,7 @@ minecraft {
102103

103104
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
104105
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
106+
args '--existing-mod', 'gtceu'
105107
}
106108
}
107109
}

‎changelog.md‎

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

3-
* HOTFIX: 64A converters were not properly respecting the high tier content config
3+
* Port to GTM 7.0.0
4+
* Make omni-breaker teleport drops to player on right-click

‎gradle.properties‎

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

1313
# Mod Properties
14-
mod_version=1.1.12
14+
mod_version=2.0.0
1515
maven_group=net.neganote.gtmutils
1616
archives_base_name=gtmutils
1717
mod_id=gtmutils
@@ -23,11 +23,11 @@ org.gradle.jvmargs=-Xmx1G
2323
# Dependencies
2424
appeng_version=15.0.18
2525
architectury_version=9.2.14
26-
gtceu_version=1.6.4
27-
ldlib_version=1.0.34
26+
gtceu_version=7.0.0
27+
ldlib_version=1.0.40.b
2828
registrate_version=MC1.20-1.3.11
2929
rhino_version=2001.2.3-build.6
3030
kubejs_version=2001.6.5-build.14
3131
configuration_version=2.2.0
32-
jei_version=15.20.0.105
33-
emi_version = 1.1.13
32+
jei_version=15.20.0.106
33+
emi_version = 1.1.22

‎src/generated/resources/assets/gtmutils/blockstates/ev_64a_energy_converter.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/ev_64a_energy_converter",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/ev_64a_energy_converter",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/ev_64a_energy_converter"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/ev_64a_energy_converter",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/ev_64a_energy_converter",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/ev_64a_energy_converter",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/hv_64a_energy_converter.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/hv_64a_energy_converter",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/hv_64a_energy_converter",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/hv_64a_energy_converter"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/hv_64a_energy_converter",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/hv_64a_energy_converter",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/hv_64a_energy_converter",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/iv_64a_energy_converter.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/iv_64a_energy_converter",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/iv_64a_energy_converter",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/iv_64a_energy_converter"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/iv_64a_energy_converter",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/iv_64a_energy_converter",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/iv_64a_energy_converter",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/luv_64a_energy_converter.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/luv_64a_energy_converter",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/luv_64a_energy_converter",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/luv_64a_energy_converter"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/luv_64a_energy_converter",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/luv_64a_energy_converter",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/luv_64a_energy_converter",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/lv_64a_energy_converter.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/lv_64a_energy_converter",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/lv_64a_energy_converter",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/lv_64a_energy_converter"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/lv_64a_energy_converter",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/lv_64a_energy_converter",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/lv_64a_energy_converter",
25+
"y": 270
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)