Skip to content

Commit 016f9d4

Browse files
XikaroXikaro
authored
Merge pull request #953 from TerraFirmaGreg-Team/dev
Release: 0.9.4
2 parents 7d4d2a2 + 3b34dd6 commit 016f9d4

File tree

70 files changed

+4831
-1285
lines changed

Some content is hidden

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

70 files changed

+4831
-1285
lines changed

‎.pakku/server-overrides/generate_auto_installation_file.bat

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
## [Unreleased]
44
### Changes
55

6+
## [0.9.4] - 06.05.2025
7+
### Changes
8+
- Fixed tags bug.
9+
610
## [0.9.3] - 05.05.2025
711
- [!WARNING] 0.9 is now out of alpha and into beta! If you're upgrading from 0.7, we put together a guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.7-to-0.9).
812
### Changes

‎config/InventoryHUD/curios.json

Lines changed: 126 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,128 @@
11
{
2-
"clothes_hat": {
3-
"x": 20,
4-
"y": 98,
5-
"enabled": true,
6-
"halign": "LEFT",
7-
"valign": "BOTTOM"
8-
},
9-
"gtceu_magnet": {
10-
"x": 2,
11-
"y": 116,
12-
"enabled": true,
13-
"halign": "LEFT",
14-
"valign": "BOTTOM"
15-
},
16-
"hands": {
17-
"x": 2,
18-
"y": 44,
19-
"enabled": true,
20-
"halign": "LEFT",
21-
"valign": "BOTTOM"
22-
},
23-
"belt": {
24-
"x": 2,
25-
"y": 62,
26-
"enabled": true,
27-
"halign": "LEFT",
28-
"valign": "BOTTOM"
29-
},
30-
"ring": {
31-
"x": 2,
32-
"y": 117,
33-
"enabled": true,
34-
"halign": "LEFT",
35-
"valign": "TOP"
36-
},
37-
"back": {
38-
"x": 2,
39-
"y": 80,
40-
"enabled": true,
41-
"halign": "LEFT",
42-
"valign": "BOTTOM"
43-
},
44-
"bracelet": {
45-
"x": 2,
46-
"y": -3,
47-
"enabled": true,
48-
"halign": "LEFT",
49-
"valign": "CENTER"
50-
},
51-
"necklace": {
52-
"x": 2,
53-
"y": 146,
54-
"enabled": true,
55-
"halign": "LEFT",
56-
"valign": "BOTTOM"
57-
},
58-
"body": {
59-
"x": 2,
60-
"y": 126,
61-
"enabled": true,
62-
"halign": "LEFT",
63-
"valign": "BOTTOM"
64-
},
65-
"clothes_torso": {
66-
"x": 20,
67-
"y": 80,
68-
"enabled": true,
69-
"halign": "LEFT",
70-
"valign": "BOTTOM"
71-
},
72-
"example": {
73-
"x": 0,
74-
"y": 240,
75-
"enabled": false,
76-
"halign": "LEFT",
77-
"valign": "TOP"
78-
},
79-
"curio": {
80-
"x": 2,
81-
"y": 136,
82-
"enabled": true,
83-
"halign": "LEFT",
84-
"valign": "TOP"
85-
},
86-
"head": {
87-
"x": 2,
88-
"y": 98,
89-
"enabled": true,
90-
"halign": "LEFT",
91-
"valign": "BOTTOM"
92-
},
93-
"charm": {
94-
"x": 2,
95-
"y": 99,
96-
"enabled": true,
97-
"halign": "LEFT",
98-
"valign": "TOP"
99-
},
100-
"clothes_pants": {
101-
"x": 20,
102-
"y": 62,
103-
"enabled": true,
104-
"halign": "LEFT",
105-
"valign": "BOTTOM"
106-
},
107-
"clothes_socks": {
108-
"x": 20,
109-
"y": 44,
110-
"enabled": true,
111-
"halign": "LEFT",
112-
"valign": "BOTTOM"
113-
},
114-
"feet": {
115-
"x": 0,
116-
"y": 60,
117-
"enabled": false,
118-
"halign": "LEFT",
119-
"valign": "TOP"
120-
},
121-
"adv_pattern_encoder": {
122-
"x": 0,
123-
"y": 300,
124-
"enabled": false,
125-
"halign": "LEFT",
126-
"valign": "TOP"
127-
}
2+
"clothes_hat": {
3+
"x": 20,
4+
"y": 98,
5+
"enabled": true,
6+
"halign": "LEFT",
7+
"valign": "BOTTOM"
8+
},
9+
"gtceu_magnet": {
10+
"x": 2,
11+
"y": 116,
12+
"enabled": true,
13+
"halign": "LEFT",
14+
"valign": "BOTTOM"
15+
},
16+
"hands": {
17+
"x": 2,
18+
"y": 44,
19+
"enabled": true,
20+
"halign": "LEFT",
21+
"valign": "BOTTOM"
22+
},
23+
"belt": {
24+
"x": 2,
25+
"y": 62,
26+
"enabled": true,
27+
"halign": "LEFT",
28+
"valign": "BOTTOM"
29+
},
30+
"ring": {
31+
"x": 2,
32+
"y": 117,
33+
"enabled": true,
34+
"halign": "LEFT",
35+
"valign": "TOP"
36+
},
37+
"back": {
38+
"x": 2,
39+
"y": 80,
40+
"enabled": true,
41+
"halign": "LEFT",
42+
"valign": "BOTTOM"
43+
},
44+
"bracelet": {
45+
"x": 2,
46+
"y": -3,
47+
"enabled": true,
48+
"halign": "LEFT",
49+
"valign": "CENTER"
50+
},
51+
"necklace": {
52+
"x": 2,
53+
"y": 146,
54+
"enabled": true,
55+
"halign": "LEFT",
56+
"valign": "BOTTOM"
57+
},
58+
"body": {
59+
"x": 2,
60+
"y": 126,
61+
"enabled": true,
62+
"halign": "LEFT",
63+
"valign": "BOTTOM"
64+
},
65+
"clothes_torso": {
66+
"x": 20,
67+
"y": 80,
68+
"enabled": true,
69+
"halign": "LEFT",
70+
"valign": "BOTTOM"
71+
},
72+
"example": {
73+
"x": 0,
74+
"y": 240,
75+
"enabled": false,
76+
"halign": "LEFT",
77+
"valign": "TOP"
78+
},
79+
"curio": {
80+
"x": 2,
81+
"y": 136,
82+
"enabled": true,
83+
"halign": "LEFT",
84+
"valign": "TOP"
85+
},
86+
"head": {
87+
"x": 2,
88+
"y": 98,
89+
"enabled": true,
90+
"halign": "LEFT",
91+
"valign": "BOTTOM"
92+
},
93+
"charm": {
94+
"x": 2,
95+
"y": 99,
96+
"enabled": true,
97+
"halign": "LEFT",
98+
"valign": "TOP"
99+
},
100+
"clothes_pants": {
101+
"x": 20,
102+
"y": 62,
103+
"enabled": true,
104+
"halign": "LEFT",
105+
"valign": "BOTTOM"
106+
},
107+
"clothes_socks": {
108+
"x": 20,
109+
"y": 44,
110+
"enabled": true,
111+
"halign": "LEFT",
112+
"valign": "BOTTOM"
113+
},
114+
"feet": {
115+
"x": 0,
116+
"y": 60,
117+
"enabled": false,
118+
"halign": "LEFT",
119+
"valign": "TOP"
120+
},
121+
"adv_pattern_encoder": {
122+
"x": 0,
123+
"y": 300,
124+
"enabled": false,
125+
"halign": "LEFT",
126+
"valign": "TOP"
127+
}
128128
}

‎config/buildinggadgets2-common.toml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
2+
#General settings
3+
[general]
4+
#Maximum distance you can build at
5+
#Range: 1 ~ 64
6+
rayTraceRange = 32
7+
8+
#Power settings
9+
[power]
10+
11+
#Building Gadget
12+
[power.building_gadget]
13+
#Maximum power for the Building Gadget
14+
#Range: > 0
15+
maxPower = 500000
16+
#Base cost per block placed
17+
#Range: > 0
18+
baseCost = 50
19+
20+
#Exchanging Gadget
21+
[power.exchanging_gadget]
22+
#Maximum power for the Exchanging Gadget
23+
#Range: > 0
24+
maxPower = 500000
25+
#Base cost per block exchanged
26+
#Range: > 0
27+
baseCost = 100
28+
29+
#Cut Paste Gadget
30+
[power.cutpaste_gadget]
31+
#Maximum power for the Cut and Paste Gadget
32+
#Range: > 0
33+
maxPower = 5000000
34+
#(LEGACY) NO LONGER USED
35+
#Range: > 0
36+
baseCost = 200
37+
#Base cost per block - Checked during CUT, Charged during PASTE
38+
#Range: > 0
39+
baseCostNew = 50
40+
41+
#Copy Paste Gadget
42+
[power.copypaste_gadget]
43+
#Maximum power for the Copy and Paste Gadget
44+
#Range: > 0
45+
maxPower = 1000000
46+
#Base cost per block Paste (Copy is Free)
47+
#Range: > 0
48+
baseCost = 50
49+
50+
#Destruction Gadget
51+
[power.destruction_gadget]
52+
#Maximum power for the Destruction Gadget
53+
#Range: > 0
54+
maxPower = 1000000
55+
#Base cost per block Destroyed
56+
#Range: > 0
57+
baseCost = 200
58+

‎config/clienttweaks-common.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
paneBuildingSupport = true
3535
#This option makes the recipe book not shift the inventory when opened. Works best with smaller GUI scales / bigger resolutions.
3636
noRecipeBookShifting = false
37+
#This option will disable paving when holding a block in your offhand.
38+
disablePavingWithBlockInOffhand = true
3739

3840
[customization]
3941
#Items that count as torches for the offhand-torch tweak options.

‎config/constructionwand-client.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
#This is the Client config for ConstructionWand.
3+
#If you're not familiar with Forge's new split client/server config, let me explain:
4+
#Client config is stored in the /config folder and only contains client specific settings like graphics and keybinds.
5+
#Mod behavior is configured in the Server config, which is world-specific and thus located
6+
#in the /saves/myworld/serverconfig folder. If you want to change the serverconfig for all
7+
#new worlds, copy the config files in the /defaultconfigs folder.
8+
[keys]
9+
#Key code of OPTKEY (Default: Left Control). Look up key codes under https://www.glfw.org/docs/3.3/group__keys.html
10+
#Range: 0 ~ 350
11+
OptKey = 341
12+
#Press SNEAK+OPTKEY instead of SNEAK for changing wand mode/direction lock
13+
ShiftOpt = false
14+
#Press SNEAK+OPTKEY instead of SNEAK for opening wand GUI
15+
ShiftOptGUI = true
16+

‎config/corpsecurioscompat-common.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
#General settings
3+
[general]
4+
#Items that should not be transferred to curios slots (format: 'modid:item')
5+
blacklisted_items = []
6+

‎config/curios-common.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#List of slots to create or modify.
22
#See documentation for syntax: https://docs.illusivesoulworks.com/curios/configuration#slot-configuration
33
#
4-
slots = [ "id=head;add_cosmetic=false", "id=feet;size=0" ]
4+
slots = ["id=head;add_cosmetic=false", "id=feet;size=0"]
55

‎config/endermanoverhaul-client.jsonc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"replaceDefaultEnderman": false
3+
}

0 commit comments

Comments
 (0)