Skip to content

Commit 81e3dfd

Browse files
committed
Merge branch 'develop'
2 parents ba3ad7c + 2a1f91b commit 81e3dfd

File tree

7 files changed

+201
-4
lines changed

7 files changed

+201
-4
lines changed

.github/ISSUE_TEMPLATE/001-request-new-feature.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: 'Request New Feature'
22
description: Request a new feature.
3+
type: Feature
34
body:
45
- type: input
56
id: version

.github/ISSUE_TEMPLATE/003-dev-only.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: 'Dev Only Issue'
22
description: "This select the dev only issue template."
3+
type: Task
34
body:
45
- type: textarea
56
attributes:

CHANGELOG_v2.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1+
# v2.7.12
2+
## New mods
3+
- Hot or Not Plus (1.1.10)
4+
- Hot or Not GTCEu (1.1.0)
5+
6+
## Update mods
7+
- CraftTweaker (4.1.20.700 -> 4.1.20.703)
8+
- Forgelin-Continuous (2.1.10.0 -> 2.1.20.0)
9+
- VintageFix (0.5.5 -> 0.5.6)
10+
11+
***
12+
113
# v2.7.11
214
## Modpack information
315
### Fix
4-
- No animations for the working machines in #412
16+
- No animations for the working machines in [#412](https://github.com/GTModpackTeam/GregTech-Expert-2/issues/412)
517

618
## Update mods
719
- Entity Culling (6.4.3 -> 6.5.0)

manifest.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"projectID": 456403,
44-
"fileID": 6142081,
44+
"fileID": 6359253,
4545
"required": true
4646
},
4747
{
@@ -216,7 +216,7 @@
216216
},
217217
{
218218
"projectID": 239197,
219-
"fileID": 5486112,
219+
"fileID": 6186559,
220220
"required": true
221221
},
222222
{
@@ -466,7 +466,7 @@
466466
},
467467
{
468468
"projectID": 871198,
469-
"fileID": 6300725,
469+
"fileID": 6412986,
470470
"required": true
471471
},
472472
{
@@ -703,6 +703,16 @@
703703
"projectID": 1178654,
704704
"fileID": 6389720,
705705
"required": true
706+
},
707+
{
708+
"projectID": 491281,
709+
"fileID": 5956010,
710+
"required": true
711+
},
712+
{
713+
"projectID": 1238400,
714+
"fileID": 6410898,
715+
"required": true
706716
}
707717
],
708718
"overrides": "overrides"

modlist.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,6 @@
136136
<li><a href="https://www.curseforge.com/minecraft/texture-packs/latest-textures"></a>Latest Textures (by katatsumuri_pan)</a></li>
137137
<li><a href="https://www.curseforge.com/minecraft/mc-mods/gtwoodprocessing"></a>GTWoodProcessing (by tier940)</a></li>
138138
<li><a href="https://www.curseforge.com/minecraft/mc-mods/gtconsolidate"></a>GTConsolidate (by ko_no)</a></li>
139+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/hot-or-not-plus"></a>Hot or Not Plus (by ACGaming)</a></li>
140+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/hot-or-not-gtceu"></a>Hot or Not GTCEu (by ko_no)</a></li>
139141
</ul>

overrides/config/HotOrNotPlus.cfg

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# Configuration file
2+
3+
general {
4+
# How cold a fluid should be to start adding effects the player (in Celsius)
5+
I:"Cold fluid temperature"=0
6+
7+
# If true, cold effects for fluids will be enabled
8+
B:"Cold fluids"=true
9+
10+
# If true, cold effects for items will be enabled
11+
B:"Cold items"=true
12+
13+
# Cold items that are included manually
14+
S:"Custom cold items" <
15+
minecraft:ice
16+
minecraft:packed_ice
17+
>
18+
19+
# Gaseous items that are included manually
20+
S:"Custom gaseous items" <
21+
>
22+
23+
# Hot items that are included manually
24+
S:"Custom hot items" <
25+
minecraft:blaze_rod
26+
gregtech:meta_ingot_hot
27+
>
28+
29+
# Additional items that protect the player from effects
30+
S:"Custom protection items" <
31+
>
32+
33+
# How frequently to check for and apply effects in ticks (performance sensitive)
34+
I:"Effect tick rate"=20
35+
36+
# Items that are exempt from effects
37+
S:"Excluded items" <
38+
gregtech:meta_item_1:80
39+
gregtech:meta_item_1:81
40+
gregtech:meta_item_1:82
41+
gregtech:meta_item_1:83
42+
gregtech:meta_item_1:84
43+
enderio:block_tank
44+
enderio:block_tank:1
45+
enderstorage:ender_storage:*
46+
>
47+
48+
# If true, gaseous effects for fluids will be enabled
49+
B:"Gaseous fluids"=true
50+
51+
# If true, gaseous effects for items will be enabled
52+
B:"Gaseous items"=true
53+
54+
# How hot a fluid should be to start burning the player (in Celsius)
55+
I:"Hot fluid temperature"=480
56+
57+
# If true, hot effects for fluids will be enabled
58+
B:"Hot fluids"=true
59+
60+
# How hot an item should be to start burning the player (in Celsius)
61+
I:"Hot item temperature (TFC)"=480
62+
63+
# If true, hot effects for items will be enabled
64+
B:"Hot items"=true
65+
66+
# Max durability of Iron Tongs, 0 for infinite durability
67+
I:"Iron Tongs durability"=0
68+
69+
# If true, hot items make the player yeet them
70+
B:"Item throwing"=false
71+
72+
# Max durability of Mitts, 0 for infinite durability
73+
I:"Mitts durability"=1000
74+
75+
# How much damage gets applied to the protection item per check
76+
I:"Protection item damage"=1
77+
78+
# If true, the player yeets the entire stack of items
79+
B:"Throw entire stack"=false
80+
81+
# If true, items causing effects will get a tooltip
82+
B:Tooltips=true
83+
84+
# Max durability of Wooden Tongs, 0 for infinite durability
85+
I:"Wooden Tongs durability"=300
86+
}
87+
88+

overrides/config/hotornotgt.cfg

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Configuration file
2+
3+
general {
4+
5+
"feature setting" {
6+
# Whether NanoMuscleSuite can protect the player from Hot ot Not effects
7+
# Default: true
8+
B:protectNano=true
9+
10+
# Whether QuarkTechSuite can protect the player from Hot ot Not effects
11+
# Default: true
12+
B:protectQuark=true
13+
}
14+
15+
"nanoarmor protection setting" {
16+
# How much EU consumption gets applied to the protect per check
17+
# Default: 1000
18+
I:energyConsumptionNano=1000
19+
20+
# Minimum number of NanoSuite equipped that can protect the player from effects
21+
# Default: 4
22+
# Min: 1
23+
# Max: 4
24+
I:minimumEquippedNano=4
25+
26+
# Whether the boots can protect the player from effects
27+
# Default: true
28+
B:protectBoots=true
29+
30+
# Whether the chestplate can protect the player from effects
31+
# Default: true
32+
B:protectChest=true
33+
34+
# Whether the helmet can protect the player from effects
35+
# Default: true
36+
B:protectHelmet=true
37+
38+
# Whether the leggings can protect the player from effects
39+
# Default: true
40+
B:protectLegs=true
41+
42+
# Whether Chestplate should be "Advanced" only or not
43+
# If false, both can be protected.
44+
# Default: true
45+
B:requiredAdvancedNanoSuite=true
46+
}
47+
48+
"quarktechsuit protection setting" {
49+
# How much EU consumption gets applied to the protect per check
50+
# Default: 1000
51+
I:energyConsumptionQuark=10000
52+
53+
# Minimum number of QuarkTechSuite equipped that can protect the player from effects
54+
# Default: 1
55+
# Min: 1
56+
# Max: 4
57+
I:minimumEquippedQuark=1
58+
59+
# Whether the boots can protect the player from effects
60+
# Default: true
61+
B:protectBoots=true
62+
63+
# Whether the chestplate can protect the player from effects
64+
# Default: true
65+
B:protectChest=true
66+
67+
# Whether the helmet can protect the player from effects
68+
# Default: true
69+
B:protectHelmet=true
70+
71+
# Whether the leggings can protect the player from effects
72+
# Default: true
73+
B:protectLegs=true
74+
75+
# Whether Chestplate should be "Advanced" only or not
76+
# If false, both can be protected.
77+
# Default: false
78+
B:requiredAdvancedQuarkSuite=false
79+
}
80+
81+
}
82+
83+

0 commit comments

Comments
 (0)