Skip to content

Commit fa00e01

Browse files
committed
更新至v0.1.3
1 parent a594275 commit fa00e01

27 files changed

Lines changed: 1012 additions & 1548 deletions

.gitignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@
55
!/README.md
66
!/.github/**
77
!/.gitignore
8-
!/options.txt
98
!/CHANGELOG.md
109
!/.gitattributes
1110
!/export_config.txt
1211

1312
!/tacz/*.zip
14-
!/tacz/cover.py
1513
!/tacz/README.md
1614

1715
!/kubejs/**
1816
/kubejs/README.txt
1917

20-
!/shaderpacks/BSL_v10.0.zip.txt
21-
2218
!config/ftbquests/**
2319

2420
!defaultconfigs/ftbessentials-server.snbt
@@ -62,5 +58,3 @@
6258
*.jar
6359
*.log*
6460
*test*
65-
66-
!tiabcurio-neoforge-1.21.1-3.0.1.jar

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v0.1.3
2+
3+
- 更新枪包
4+
- 更新模组
5+
- 自动生成子弹与沉浸工程的互动配方
6+
- 移除附加的材质包与光影
7+
18
# v0.1.2
29

310
- 更新枪包

config/acceleratedrendering-client.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
#- OPENGL: Viewport settings that will be modified by other mods will be recorded and restored using OpenGL to work correctly with them even if they don't set viewport using Mojang's GLStateManager, which is slower but has most compatibility.
6060
#Allowed Values: IGNORED, MOJANG, OPENGL
6161
viewport_binding_state = "IGNORED"
62+
#- IGNORED: Scissor settings that will be modified by other mods will not be restored after the acceleration, which is faster but reduces compatibility with them.
63+
#- MOJANG: Scissor settings that will be modified by other mods will be recorded and restored using Mojang's GuiGraphics to work correctly with them.
64+
#- OPENGL: Scissor settings that will be modified by other mods will be recorded and restored using OpenGL to work correctly with them even if they don't set viewport using Mojang's GuiGraphics, which is slower but has most compatibility.
65+
#Allowed Values: IGNORED, MOJANG, OPENGL
66+
scissor_binding_state = "MOJANG"
6267

6368
#Block Buffer Restoring Settings
6469
#A few mods and shader packs will use their on block buffers when rendering, which may introduce conflicts when working with Accelerated Rendering that also uses block buffers.
@@ -139,10 +144,14 @@
139144
#- ENABLED: Accelerated Rendering will still accelerate item models that are marked as "too small to make up the cost of acceleration" when rendering it in a container GUI unless mods explicitly disable it temporarily when rendering their own item models, which may slightly reduce the FPS but accelerate vanilla-like modded item models with large amount of vertices.
140145
#Allowed Values: DISABLED, ENABLED
141146
gui_acceleration = "ENABLED"
142-
#- DISABLED: Items in the container GUI will be rendered as per item per batch if the GUI Acceleration is enabled, which is inefficient and may cause slight reduction in FPS, but it has better compatibility in modded container GUI.
147+
#- DISABLED: Items in the container GUI will be rendered as per item per batch if the GUI Acceleration is enabled, which is inefficient and may cause reduction in FPS, but it has better compatibility in modded container GUI.
143148
#- ENABLED: Items in the container will be rendered together in a single batch if the GUI Acceleration is enabled, which is much more efficient but has little compatibility in modded container GUI.
144149
#Allowed Values: DISABLED, ENABLED
145150
gui_item_batching = "ENABLED"
151+
#- DISABLED: Items rendered in background and slots will be separated into two batches when accelerate container GUI, which is inefficient any may cause slight reduction in FPS, but it has better compatibility in modded container GUI.
152+
#- ENABLED: Items rendered in background and slots will be merged into a single batch when accelerate container GUI, which is much more efficient but has less compatibility in modded container GUI.
153+
#Allowed Values: DISABLED, ENABLED
154+
merge_gui_item_batching = "ENABLED"
146155

147156
#Accelerated Text Rendering Settings
148157
#Accelerated Text Rendering uses GPU to cache and transform vertices while rendering text through BakedGlyph, instead of generating and transforming vertices every time the text are rendered in CPU.

config/create-server.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@
227227
#Whether the players hitbox should be expanded to the size of the contraption hitbox.
228228
#[Technical]
229229
syncPlayerPickupHitboxWithContraptionHitbox = false
230+
#.
231+
#Whether to prevent block dropping when contraption is placed inside in-world blocks.
232+
noDropWhenContraptionReplaceBlocks = false
230233

231234
#.
232235
#Configure speed/capacity levels for requirements and indicators.

config/ftbchunks-client.snbt

Lines changed: 113 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
# Default: false
5656
chunk_grid: false
5757

58+
# Claim mode for the chunk claiming screen
59+
# Default: "freehand"
60+
# Valid values: "freehand", "rectangle", "circle"
61+
claim_mode: "freehand"
62+
5863
# Show claimed chunks on the map
5964
# Default: true
6065
claimed_chunks_on_map: true
@@ -133,133 +138,133 @@
133138
# Default: true
134139
entity_heads: true
135140
entity_icon: {
136-
"aquaculture:red_shrooma": false
137-
"minecraft:shulker": true
138-
"twilightforest:swarm_spider": true
139-
"twilightforest:deer": true
140-
"minecraft:chicken": true
141-
"minecraft:trader_llama": true
142-
"aquaculture:brown_shrooma": false
143-
"aquaculture:atlantic_herring": false
144-
"aquaculture:pollock": false
145141
"minecraft:horse": true
146-
"cataclysm:lionfish": true
147-
"minecraft:skeleton_horse": true
148-
"cataclysm:the_harbinger": true
149-
"aquaculture:perch": false
150-
"minecraft:allay": true
151-
"aquaculture:piranha": false
152-
"twilightforest:naga": true
153-
"aquaculture:pacific_halibut": false
142+
"minecraft:parrot": true
143+
"cataclysm:koboleton": true
154144
"minecraft:ocelot": true
155-
"minecraft:warden": true
156-
"twilightforest:squirrel": true
145+
"aquaculture:red_shrooma": false
157146
"minecraft:blaze": true
147+
"aquaculture:tambaqui": false
148+
"minecraft:trader_llama": true
149+
"youkaishomecoming:lamprey": true
150+
"aquaculture:bayad": false
151+
"twilightforest:mosquito_swarm": true
152+
"aquaculture:minnow": false
153+
"minecraft:villager": true
154+
"minecraft:glow_squid": true
155+
"minecraft:bee": true
156+
"minecraft:creeper": true
157+
"cataclysm:the_prowler": true
158+
"minecraft:armadillo": true
158159
"minecraft:pig": true
159-
"minecraft:ender_dragon": true
160+
"minecraft:drowned": true
161+
"cataclysm:deepling_angler": true
162+
"touhou_little_maid:maid": true
160163
"aquaculture:muskellunge": false
161-
"cataclysm:deepling_brute": true
164+
"minecraft:goat": true
162165
"twilightforest:armored_giant": true
163-
"minecraft:armadillo": true
164-
"minecraft:parrot": true
165-
"minecraft:llama": true
166-
"minecraft:creeper": true
167-
"minecraft:rabbit": true
166+
"twilightforest:troll": true
167+
"minecraft:panda": true
168+
"minecraft:wolf": true
169+
"twilightforest:dwarf_rabbit": true
170+
"minecraft:turtle": true
171+
"minecraft:guardian": true
172+
"minecraft:iron_golem": true
168173
"minecraft:husk": true
169-
"aquaculture:arapaima": true
170-
"minecraft:bat": true
171-
"aquaculture:smallmouth_bass": false
172-
"minecraft:sheep": true
173-
"minecraft:slime": true
174-
"twilightforest:kobold": true
175-
"minecraft:goat": true
176-
"minecraft:squid": true
177-
"minecraft:wandering_trader": true
178-
"aquaculture:bluegill": false
179-
"cataclysm:deepling_angler": true
180-
"aquaculture:atlantic_halibut": false
181174
"minecraft:tropical_fish": false
182-
"twilightforest:mosquito_swarm": true
183-
"twilightforest:boar": true
184-
"twilightforest:raven": true
185-
"twilightforest:tiny_bird": true
186-
"minecraft:frog": true
187-
"minecraft:piglin": true
175+
"aquaculture:smallmouth_bass": false
176+
"minecraft:ender_dragon": true
177+
"aquaculture:blackfish": false
178+
"supplementaries:red_merchant": true
188179
"twilightforest:giant_miner": true
189-
"aquaculture:boulti": false
190-
"minecraft:vindicator": true
191-
"cataclysm:the_prowler": true
192-
"minecraft:salmon": false
193-
"minecraft:magma_cube": true
194-
"cataclysm:deepling": true
195-
"minecraft:zombie": true
196-
"minecraft:strider": true
197-
"minecraft:silverfish": true
198-
"aquaculture:tambaqui": false
199-
"aquaculture:atlantic_cod": false
200-
"minecraft:wither_skeleton": true
201-
"twilightforest:dwarf_rabbit": true
202-
"minecraft:pillager": true
203-
"minecraft:bogged": true
204-
"minecraft:villager": true
205-
"minecraft:glow_squid": true
206180
"aquaculture:carp": false
207-
"minecraft:cow": true
208-
"minecraft:turtle": true
209-
"yungscavebiomes:sand_snapper": true
210-
"minecraft:bee": true
211-
"minecraft:wolf": true
212-
"aquaculture:bayad": false
213-
"aquaculture:blackfish": false
214-
"aquaculture:synodontis": false
215-
"minecraft:camel": true
216-
"minecraft:guardian": true
181+
"minecraft:hoglin": true
217182
"touhou_little_maid:fairy": true
218-
"supplementaries:red_merchant": true
219-
"aquaculture:brown_trout": false
220-
"minecraft:spider": true
183+
"minecraft:pillager": true
184+
"aquaculture:piranha": false
185+
"minecraft:bat": true
186+
"minecraft:dolphin": true
221187
"twilightforest:redcap": true
222-
"cataclysm:the_watcher": true
223-
"minecraft:drowned": true
224-
"touhou_little_maid:maid": true
225-
"minecraft:fox": true
188+
"twilightforest:swarm_spider": true
189+
"aquaculture:rainbow_trout": false
190+
"aquaculture:pink_salmon": false
191+
"twilightforest:naga": true
192+
"minecraft:frog": true
193+
"twilightforest:tiny_bird": true
194+
"minecraft:donkey": true
195+
"aquaculture:gar": false
196+
"aquaculture:tuna": false
197+
"minecraft:shulker": true
226198
"minecraft:mooshroom": true
227-
"minecraft:piglin_brute": true
228-
"minecraft:polar_bear": true
199+
"aquaculture:bluegill": false
200+
"minecraft:zombie": true
201+
"aquaculture:pollock": false
202+
"minecraft:squid": true
203+
"minecraft:wither_skeleton": true
229204
"minecraft:witch": true
230-
"aquaculture:arrau_turtle": false
231-
"minecraft:zombified_piglin": true
232-
"minecraft:ghast": true
233-
"aquaculture:minnow": false
234-
"minecraft:cat": true
235-
"youkaishomecoming:lamprey": true
236-
"minecraft:panda": true
237-
"cataclysm:koboleton": true
238205
"minecraft:elder_guardian": true
239-
"twilightforest:bighorn_sheep": true
240-
"minecraft:enderman": true
241-
"aquaculture:red_grouper": false
242-
"aquaculture:pink_salmon": false
243-
"minecraft:iron_golem": true
244-
"aquaculture:tuna": false
245-
"minecraft:zombie_villager": true
206+
"aquaculture:boulti": false
207+
"aquaculture:arapaima": true
208+
"cataclysm:deepling": true
209+
"twilightforest:squirrel": true
210+
"minecraft:allay": true
211+
"aquaculture:atlantic_cod": false
212+
"twilightforest:deer": true
213+
"cataclysm:the_watcher": true
214+
"minecraft:silverfish": true
215+
"minecraft:polar_bear": true
216+
"minecraft:camel": true
217+
"aquaculture:atlantic_herring": false
246218
"minecraft:pufferfish": false
247-
"minecraft:phantom": true
248-
"minecraft:axolotl": true
249-
"yungscavebiomes:ice_cube": true
250-
"minecraft:cod": false
251-
"aquaculture:catfish": false
252219
"minecraft:cave_spider": true
253-
"aquaculture:rainbow_trout": false
254-
"minecraft:stray": true
255-
"aquaculture:jellyfish": false
256-
"twilightforest:troll": true
257-
"minecraft:dolphin": true
258-
"aquaculture:gar": false
220+
"minecraft:magma_cube": true
221+
"minecraft:skeleton_horse": true
222+
"minecraft:warden": true
259223
"aquaculture:capitaine": false
260-
"minecraft:donkey": true
224+
"aquaculture:atlantic_halibut": false
225+
"minecraft:chicken": true
226+
"aquaculture:red_grouper": false
227+
"aquaculture:jellyfish": false
228+
"twilightforest:boar": true
229+
"minecraft:cat": true
230+
"minecraft:strider": true
231+
"minecraft:rabbit": true
232+
"minecraft:cow": true
233+
"cataclysm:lionfish": true
234+
"minecraft:piglin_brute": true
235+
"minecraft:ghast": true
236+
"aquaculture:perch": false
237+
"minecraft:vindicator": true
238+
"minecraft:bogged": true
239+
"minecraft:salmon": false
240+
"twilightforest:bighorn_sheep": true
241+
"minecraft:stray": true
242+
"aquaculture:pacific_halibut": false
243+
"minecraft:wandering_trader": true
244+
"twilightforest:raven": true
245+
"minecraft:piglin": true
246+
"minecraft:zombie_villager": true
247+
"minecraft:zombified_piglin": true
248+
"cataclysm:the_harbinger": true
249+
"yungscavebiomes:sand_snapper": true
250+
"aquaculture:catfish": false
251+
"minecraft:slime": true
252+
"aquaculture:synodontis": false
253+
"aquaculture:brown_shrooma": false
254+
"minecraft:fox": true
255+
"aquaculture:brown_trout": false
261256
"minecraft:skeleton": true
262-
"minecraft:hoglin": true
257+
"yungscavebiomes:ice_cube": true
258+
"minecraft:sheep": true
259+
"twilightforest:kobold": true
260+
"minecraft:phantom": true
261+
"minecraft:cod": false
262+
"cataclysm:deepling_brute": true
263+
"aquaculture:arrau_turtle": false
264+
"minecraft:llama": true
265+
"minecraft:enderman": true
266+
"minecraft:spider": true
267+
"minecraft:axolotl": true
263268
}
264269

265270
# Minimap font scaling (values not a multiple of 0.5 may look bad)

config/ftbchunks-world.snbt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@
9191
# Valid values: "largest", "owner", "sum", "average"
9292
party_limit_mode: "largest"
9393
}
94-
custom_behaviour: {
95-
chunks_with_custom_y: [ ]
96-
97-
# Custom minimum Y level to scan when rendering map, used if use_custom_min_y_level is true
98-
# Default: -32768
99-
# Range: -32768 ~ 32767
100-
custom_min_y_level: -32768
101-
102-
# Override minimum Y level used when rendering map
103-
# Default: false
104-
use_custom_min_y_level: false
105-
}
10694
dev: {
10795
# Enable dev commands
10896
# Default: false

config/ftbultimine-client.snbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
# Valid values: "top_left", "top", "top_right", "right", "bottom_right", "bottom", "bottom_left", "left"
2828
overlay_pos: "bottom_right"
2929

30+
# Default: 1.0
31+
# Range: -∞ ~ +∞
32+
overlay_scale: 1.0d
33+
3034
# When holding the Ultimine key, must the player also be sneaking to show the shapes menu?
3135
# Default: true
3236
require_sneak_for_menu: true

config/ftbultimine-server.snbt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
experience_per_block: 0.0d
1818

1919
# Max amount of blocks that can be ultimined at once
20+
# If FTB Ranks is installed, the 'ftbultimine.max_blocks' ranks node can override this
21+
# This value can also be modified with the 'ftbultimine:max_blocks_modifier' entity attribute
2022
# Default: 64
2123
# Range: 0 ~ 32768
2224
max_blocks: 256
@@ -29,7 +31,9 @@
2931
# Default: false
3032
require_valid_tool_for_block: false
3133

32-
# Cooldown in ticks between successive uses of the Ultimine feature
34+
# Cooldown in ticks between successive uses of the ultimine feature
35+
# If FTB Ranks is installed, the 'ftbultimine.ultimine_cooldown' ranks node can override this
36+
# This value can also be modified with the 'ftbultimine:cooldown_modifier' entity attribute
3337
# Default: 0
3438
# Range: 0 ~ 9223372036854775807
3539
ultimine_cooldown: 0L

0 commit comments

Comments
 (0)