TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Fix Universal Tweaks Conflicts (#509)

Browse Source 
[COMBINE]
commits = ["7ca652d468166680fed9927c6dc2e4e0ca44f33e"]
[COMBINE]
This commit is contained in:
Integer Limit 2023-11-01 20:46:09 +11:00 committed by GitHub
parent 2d6e7a647e
commit 9fc71696fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
overrides/config/clienttweaks.cfg Normal file → Executable file
View File

@ -3,8 +3,6 @@
general { general {
# Items that will not prevent offhand-torch placement while in offhand, but do not place torches by themselves [default: [tconstruct:shovel], [tconstruct:excavator]] # Items that will not prevent offhand-torch placement while in offhand, but do not place torches by themselves [default: [tconstruct:shovel], [tconstruct:excavator]]
S:"Offhand Torch Tools" < S:"Offhand Torch Tools" <
tconstruct:shovel
tconstruct:excavator
> >
# Items that count as torches for the offhand-torch tweak options. [default: [minecraft:torch], [tconstruct:stone_torch]] # Items that count as torches for the offhand-torch tweak options. [default: [minecraft:torch], [tconstruct:stone_torch]]
@ -37,7 +35,7 @@ tweaks {
B:"Disable Auto Jump"=false B:"Disable Auto Jump"=false
# This option disables the shifting of the inventory to the right when potion effects are active. [default: true] # This option disables the shifting of the inventory to the right when potion effects are active. [default: true]
B:"Disable Potion Shift"=true B:"Disable Potion Shift"=false
# This option will disable step assist added by other mods. [default: false] # This option will disable step assist added by other mods. [default: false]
B:"Disable Step Assist"=false B:"Disable Step Assist"=false
@ -58,7 +56,7 @@ tweaks {
B:"Master Volume Slider"=true B:"Master Volume Slider"=true
# This prevents torches from being placed from your offhand if you have a block in your main hand. [default: true] # This prevents torches from being placed from your offhand if you have a block in your main hand. [default: true]
B:"No Offhand Torch With Block"=true B:"No Offhand Torch With Block"=false
# This prevents torches from being placed from your off hand if you have an empty main hand. [default: false] # This prevents torches from being placed from your off hand if you have an empty main hand. [default: false]
B:"No Offhand Torch With Empty Hand"=false B:"No Offhand Torch With Empty Hand"=false

4
tools/templates/randompatches.cfg
View File

@ -144,7 +144,7 @@ misc {
# Fixes MC-2025. # Fixes MC-2025.
# More information can be found here: https://www.reddit.com/r/Mojira/comments/8pgd4q/final_and_proper_fix_to_mc2025_simple_reliable/ # More information can be found here: https://www.reddit.com/r/Mojira/comments/8pgd4q/final_and_proper_fix_to_mc2025_simple_reliable/
# Default: true # Default: true
B:mc2025Fix=true B:mc2025Fix=false
# Fixes MC-64836, which causes non-player entities to be allowed to control minecarts using their AI. # Fixes MC-64836, which causes non-player entities to be allowed to control minecarts using their AI.
# Default: true # Default: true
@ -152,7 +152,7 @@ misc {
# Fixes MC-5694, which causes fast mining to sometimes only destroy blocks client-side only. # Fixes MC-5694, which causes fast mining to sometimes only destroy blocks client-side only.
# Default: true # Default: true
B:miningGhostBlocksFix=true B:miningGhostBlocksFix=false
# Fixes MC-10369 (server-side particle spawning not creating particles for clients) and MC-93826 (breeding hearts only showing once instead of all of the time an animal can breed). # Fixes MC-10369 (server-side particle spawning not creating particles for clients) and MC-93826 (breeding hearts only showing once instead of all of the time an animal can breed).
# Default: true # Default: true