Skip to content

Commit aa696c2

Browse files
NielsPilgaardNielsPilgaard
committed
Merge branch 'develop'
2 parents 9693210 + a3a3330 commit aa696c2

29 files changed

+415
-60
lines changed

‎automation/remove-client-mods.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ $CLIENT_MODS_TO_REMOVE_FROM_SERVER_FILES = @(
1111
"BetterF3",
1212
"lighty",
1313
"sodium",
14-
"iris"
14+
"iris",
15+
"smithingtemplateviewer"
1516
)
1617

1718
$InstanceRoot = ("$PSScriptRoot/.." | Resolve-Path)

‎automation/settings.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica10"
2929
$CLIENT_NAME = "Enigmatica10"
3030

3131
# Version Of The Modpack
32-
$MODPACK_VERSION = "1.24.1"
32+
$MODPACK_VERSION = "1.25.0"
3333

3434
# Last Version Of The Modpack
3535
# Needed For Changelog Parsing
36-
$LAST_MODPACK_VERSION = "1.24.0"
36+
$LAST_MODPACK_VERSION = "1.24.1"
3737

3838
# =====================================================================//
3939
# CHANGELOG SETTINGS

‎config/apotheosis/apothic_attributes.cfg

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@ general {
1313
# Default: true
1414
B:"Enable Potion Tooltips"=true
1515

16-
# A list of attributes that will be hidden from the Attributes GUI.
17-
# Client-authoritative.
16+
# A list of attributes that will be hidden from the Attributes GUI. Client-authoritative.
17+
# This is useful for attributes that are not meant to be visible to players, such as those used by Apothic Attributes itself.
18+
# This config supports the following input formats:
19+
# - ResourceLocation strings, such as minecraft:generic.max_health, used to block specific attributes.
20+
# - Namespaced wildcards, such as apothic_attributes:*, used to block all attributes in a namespace.
21+
# - Negation entries, such as !apothic_attributes:elytra_flight, which will un-block a specific attribute that would otherwise be blocked by a wildcard.
22+
# Note:
23+
# The list is processed in order. Place negation entries at the end of the list to ensure they take precedence.
24+
#
1825
# Default: [neoforge:nametag_distance], [neoforge:creative_flight], [apothic_attributes:elytra_flight], [apothic_attributes:ghost_health]
1926
S:"Hidden Attributes" <
2027
neoforge:nametag_distance
@@ -87,6 +94,15 @@ combat_rules {
8794
#
8895
# Default: min(toughness * 0.02, 0.6)
8996
S:"Armor Toughness Formula"=min(toughness * 0.02, 0.6)
97+
98+
# The factor by which negative armor values will increase incoming damage.
99+
# Each point of negative armor will increase incoming damage by this factor.
100+
# A value of 0.015 means that 1 point of negative armor will increase incoming damage by 1.5%.
101+
# Note:
102+
# Negative armor is typically only encountered when the attacker has more armor pen than the defender has armor.
103+
#
104+
# Default: 0.015; Range: [0.0 ~ 1.0]
105+
S:"Negative Armor Factor"=0.015
90106
}
91107

92108

‎config/ars_elemental/glyph_conflagrate.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
# Default: 9.0
2929
# Range: 0.0 ~ 2.147483647E9
3030
damage = 9.0
31-
# Default: 3.0
31+
# Default: 5.0
3232
# Range: 0.0 ~ 2.147483647E9
3333
amplify = 3.0

‎config/ars_nouveau-server.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
# Default: 30
6060
# Range: > 1
6161
lecternLinkRange = 30
62+
#Maximum range of the decor blossom
63+
# Default: 30
64+
# Range: > 1
65+
decorBlossomRange = 30
6266

6367
#Infinite Spells Mode
6468
[spell_length]

‎config/artifacts/client.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ showTooltips = true
1515
#Whether mimics can use textures from Lootr or Quark
1616
#Allowed Values: true, false
1717
useModdedMimicTextures = true
18+
#Controls the vertical position of the Helium Flamingo's charge meter
19+
#Range: -2147483648 ~ 2147483647
20+
heliumFlamingoOverlayOffset = 0

‎config/clientsort-server.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"options": {
3+
"classPolicies": {
4+
"com.simibubi.create.content.equipment.toolbox.ToolboxMenu": {
5+
"className": "com.simibubi.create.content.equipment.toolbox.ToolboxMenu",
6+
"sortEnabled": false,
7+
"stackFillEnabled": false,
8+
"transferEnabled": false
9+
}
10+
}
11+
}
12+
}

‎config/clientsort.json

Lines changed: 70 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"sortOrderStr": "creative",
1010
"shiftSortOrderStr": "quantity",
1111
"ctrlSortOrderStr": "alphabet",
12-
"altSortOrderStr": "raw_id",
12+
"altSortOrderStr": "rawId",
1313
"playSoundSort": false,
1414
"playSoundOther": false,
1515
"interactionSound": "minecraft:block.note_block.xylophone",
@@ -18,56 +18,99 @@
1818
"soundPitchMax": 2.0,
1919
"soundVolume": 0.2,
2020
"allowSoundOverlap": true,
21+
"isolateKeybinds": true,
2122
"showButtons": false,
22-
"firstButton": "SORT",
23-
"secondButton": "STACK_FILL",
24-
"thirdButton": "TRANSFER",
25-
"buttonDefaultOffset": {
23+
"firstButtonOp": "SORT",
24+
"secondButtonOp": "STACK_FILL",
25+
"thirdButtonOp": "TRANSFER",
26+
"layoutOffset": {
2627
"x": -4,
2728
"y": 0
2829
},
29-
"buttonLayouts": {
30+
"classPolicies": {
31+
"com.simibubi.create.content.equipment.toolbox.ToolboxMenu": {
32+
"className": "com.simibubi.create.content.equipment.toolbox.ToolboxMenu",
33+
"sortPolicy": "NONE",
34+
"stackFillPolicy": "NONE",
35+
"transferPolicy": "NONE",
36+
"ignoredSlots": []
37+
},
3038
"net.minecraft.world.entity.player.Inventory": {
3139
"className": "net.minecraft.world.entity.player.Inventory",
32-
"sortEnabled": true,
33-
"stackFillEnabled": true,
34-
"transferEnabled": true
40+
"buttonOffset": {
41+
"x": -4,
42+
"y": 0
43+
},
44+
"sortPolicy": "KEYBIND_BUTTON",
45+
"stackFillPolicy": "KEYBIND_BUTTON",
46+
"transferPolicy": "KEYBIND_BUTTON",
47+
"ignoredSlots": []
3548
},
3649
"net.minecraft.world.inventory.ChestMenu": {
3750
"className": "net.minecraft.world.inventory.ChestMenu",
38-
"sortEnabled": true,
39-
"stackFillEnabled": true,
40-
"transferEnabled": true
51+
"buttonOffset": {
52+
"x": -4,
53+
"y": 0
54+
},
55+
"sortPolicy": "KEYBIND_BUTTON",
56+
"stackFillPolicy": "KEYBIND_BUTTON",
57+
"transferPolicy": "KEYBIND_BUTTON",
58+
"ignoredSlots": []
4159
},
4260
"net.minecraft.world.inventory.HopperMenu": {
4361
"className": "net.minecraft.world.inventory.HopperMenu",
44-
"sortEnabled": false,
45-
"stackFillEnabled": false,
46-
"transferEnabled": true
62+
"buttonOffset": {
63+
"x": -4,
64+
"y": 0
65+
},
66+
"sortPolicy": "KEYBIND",
67+
"stackFillPolicy": "KEYBIND",
68+
"transferPolicy": "KEYBIND_BUTTON",
69+
"ignoredSlots": []
4770
},
4871
"net.minecraft.world.inventory.HorseInventoryMenu": {
4972
"className": "net.minecraft.world.inventory.HorseInventoryMenu",
50-
"sortEnabled": true,
51-
"stackFillEnabled": true,
52-
"transferEnabled": true
73+
"buttonOffset": {
74+
"x": -4,
75+
"y": 0
76+
},
77+
"sortPolicy": "KEYBIND_BUTTON",
78+
"stackFillPolicy": "KEYBIND_BUTTON",
79+
"transferPolicy": "KEYBIND_BUTTON",
80+
"ignoredSlots": []
5381
},
5482
"net.minecraft.world.inventory.PlayerEnderChestContainer": {
5583
"className": "net.minecraft.world.inventory.PlayerEnderChestContainer",
56-
"sortEnabled": true,
57-
"stackFillEnabled": true,
58-
"transferEnabled": true
84+
"buttonOffset": {
85+
"x": -4,
86+
"y": 0
87+
},
88+
"sortPolicy": "KEYBIND_BUTTON",
89+
"stackFillPolicy": "KEYBIND_BUTTON",
90+
"transferPolicy": "KEYBIND_BUTTON",
91+
"ignoredSlots": []
5992
},
6093
"net.minecraft.world.inventory.ShulkerBoxMenu": {
6194
"className": "net.minecraft.world.inventory.ShulkerBoxMenu",
62-
"sortEnabled": true,
63-
"stackFillEnabled": true,
64-
"transferEnabled": true
95+
"buttonOffset": {
96+
"x": -4,
97+
"y": 0
98+
},
99+
"sortPolicy": "KEYBIND_BUTTON",
100+
"stackFillPolicy": "KEYBIND_BUTTON",
101+
"transferPolicy": "KEYBIND_BUTTON",
102+
"ignoredSlots": []
65103
},
66104
"net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity": {
67105
"className": "net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity",
68-
"sortEnabled": true,
69-
"stackFillEnabled": true,
70-
"transferEnabled": true
106+
"buttonOffset": {
107+
"x": -4,
108+
"y": 0
109+
},
110+
"sortPolicy": "KEYBIND_BUTTON",
111+
"stackFillPolicy": "KEYBIND_BUTTON",
112+
"transferPolicy": "KEYBIND_BUTTON",
113+
"ignoredSlots": []
71114
}
72115
}
73116
}

‎config/constructionstick-server.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
UndoHistory = 3
145145
#Place blocks below you while falling > 10 blocks with angel upgrade (Can be used to save you from drops/the void)
146146
AngelFalling = false
147-
#Blocks to treat equally when in Similar mode. Enter block IDs seperated by ;
147+
#Blocks to treat equally when in Similar mode. Enter block IDs separated by ;
148148
SimilarBlocks = ["minecraft:dirt;minecraft:grass_block;minecraft:coarse_dirt;minecraft:podzol;minecraft:mycelium;minecraft:farmland;minecraft:dirt_path;minecraft:rooted_dirt"]
149149

150150
[blockentity]

‎config/create_hypertube-server.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@
44
allowFishTravel = true
55
#Allow villagers to go through the tubes.
66
allowVillagerTravel = true
7+
#Multiplier for the speed of the tubes. Default is 1.0, which is normal speed. (THIS IS HIGHLY EXPERIMENTAL)
8+
# Default: 1.0
9+
# Range: 0.5 ~ 99.0
10+
speedMultiplier = 1.0

0 commit comments

Comments
 (0)