fix dupe with toolbelt and sns containers #2926
This commit is contained in:
parent
92a4574c88
commit
c76c4a0f2f
3 changed files with 67 additions and 64 deletions
|
|
@ -87,6 +87,7 @@
|
|||
- All tools should now have TFC damage types (#2868) @Pyritie
|
||||
- TFC magma blocks, lightblooms, and bulbkins now correctly have emissive textures @Pyritie
|
||||
- Quivers can now also go in the belt curios slot (#2927) @Pyritie
|
||||
- Various quest fixes and improvements @ashleney @Tinchik @TomPlop @Pyritie
|
||||
### Bug fixes
|
||||
- Fixed being able to right-click crops with a scythe to harvest them (#1724) @Ujhik
|
||||
- Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie
|
||||
|
|
@ -108,6 +109,8 @@
|
|||
- Fixed the interdimensional wireless card so it should actually work again (the crafting requests aren't fixed yet though) @Mqrius
|
||||
- Fixed the position of the dimension indicator on recipes that are valid on multiple dimensions @BlueBoat29
|
||||
- Fixed a rare crash with beneath to overworld teleporting @Lolens
|
||||
- Added Sacks 'n' Such's containers to the Toolbelt blacklist, preventing a dupe (#2926) @Pyritie
|
||||
- Fixed a dupe with steam miner and steam rock crusher recycling @Pyritie
|
||||
### Translation updates
|
||||
- Chinese (simplified) @jmecn
|
||||
- Russian @Petr211071 + @Nixieeunrare
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#List of items to force-allow placing in the belt. Takes precedence over blacklist.
|
||||
whitelist = ["measurements:tape_measure"]
|
||||
#List of items to disallow from placing in the belt. (whitelist takes precedence)
|
||||
blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel"]
|
||||
blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel", "sns:burlap_sack", "sns:frame_pack", "sns:leather_sack", "sns:ore_sack", "sns:quiver", "sns:seed_pouch", "sns:straw_basket"]
|
||||
#When set to false, stackable items will no longer be allowed by default.
|
||||
allowAllNonStackableItems = true
|
||||
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -1,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"weirdness": -0.2,
|
||||
"depth": 0,
|
||||
"offset": 0
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -1,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"weirdness": 0,
|
||||
"depth": 0,
|
||||
"offset": 0
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -1,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"weirdness": 0.2,
|
||||
"depth": 0,
|
||||
"offset": 0
|
||||
|
|
@ -250,7 +250,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.47,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"weirdness": -0.2,
|
||||
"depth": 0,
|
||||
"offset": 0
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.47,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"weirdness": 0,
|
||||
"depth": 0,
|
||||
"offset": 0
|
||||
|
|
@ -274,7 +274,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.47,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"weirdness": 0.2,
|
||||
"depth": 0,
|
||||
"offset": 0
|
||||
|
|
@ -324,7 +324,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.44,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0
|
||||
|
|
@ -336,7 +336,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.44,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0
|
||||
|
|
@ -348,7 +348,7 @@
|
|||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.44,
|
||||
"erosion": -0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0
|
||||
|
|
@ -398,8 +398,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.39,
|
||||
"erosion": -0.05,
|
||||
"continentalness": -0.315,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0
|
||||
|
|
@ -410,8 +410,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.39,
|
||||
"erosion": -0.05,
|
||||
"continentalness": -0.315,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0
|
||||
|
|
@ -422,8 +422,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.39,
|
||||
"erosion": -0.05,
|
||||
"continentalness": -0.315,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0
|
||||
|
|
@ -435,7 +435,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.39,
|
||||
"continentalness": -0.315,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
|
|
@ -447,7 +447,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.39,
|
||||
"continentalness": -0.315,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
|
|
@ -459,7 +459,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.39,
|
||||
"continentalness": -0.315,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
|
|
@ -474,7 +474,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.375,
|
||||
"continentalness": -0.3,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
|
|
@ -486,7 +486,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.375,
|
||||
"continentalness": -0.3,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
|
|
@ -498,7 +498,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.375,
|
||||
"continentalness": -0.3,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
|
|
@ -511,7 +511,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.1,
|
||||
"continentalness": 0,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
|
|
@ -523,7 +523,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.1,
|
||||
"continentalness": 0,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
|
|
@ -535,7 +535,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.1,
|
||||
"continentalness": 0,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
|
|
@ -550,8 +550,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.375,
|
||||
"erosion": -0.05,
|
||||
"continentalness": -0.3,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -562,8 +562,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.375,
|
||||
"erosion": -0.05,
|
||||
"continentalness": -0.3,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0.0
|
||||
|
|
@ -574,8 +574,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.375,
|
||||
"erosion": -0.05,
|
||||
"continentalness": -0.3,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -587,8 +587,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.1,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -599,8 +599,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.1,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0.0
|
||||
|
|
@ -611,8 +611,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.1,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -625,7 +625,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.05,
|
||||
"continentalness": 0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
|
|
@ -637,7 +637,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.05,
|
||||
"continentalness": 0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
|
|
@ -649,7 +649,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.05,
|
||||
"continentalness": 0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
|
|
@ -662,7 +662,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.35,
|
||||
"continentalness": 0.45,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
|
|
@ -674,7 +674,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.35,
|
||||
"continentalness": 0.45,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
|
|
@ -686,7 +686,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.35,
|
||||
"continentalness": 0.45,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
|
|
@ -701,8 +701,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.05,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -713,8 +713,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.05,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0.0
|
||||
|
|
@ -725,8 +725,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": -0.05,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.05,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -739,8 +739,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.35,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.45,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -751,8 +751,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.35,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.45,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0.0
|
||||
|
|
@ -763,8 +763,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.35,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.45,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -779,7 +779,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.4,
|
||||
"continentalness": 0.5,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
|
|
@ -791,7 +791,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.4,
|
||||
"continentalness": 0.5,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
|
|
@ -803,7 +803,7 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.4,
|
||||
"continentalness": 0.5,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
|
|
@ -817,8 +817,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.4,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.5,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": -0.2,
|
||||
"offset": 0.0
|
||||
|
|
@ -829,8 +829,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.4,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.5,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0,
|
||||
"offset": 0.0
|
||||
|
|
@ -841,8 +841,8 @@
|
|||
"parameters": {
|
||||
"temperature": 0,
|
||||
"humidity": 0,
|
||||
"continentalness": 0.4,
|
||||
"erosion": -0.05,
|
||||
"continentalness": 0.5,
|
||||
"erosion": 0.05,
|
||||
"depth": 0,
|
||||
"weirdness": 0.2,
|
||||
"offset": 0.0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue