Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into quest branch #824

Merged
merged 91 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
e7446f0
Merge remote-tracking branch 'last8kings/master-ceu' into master-hotf…
bruberu Mar 6, 2024
d8b890d
uranium stoik fixes
trainvoi Mar 6, 2024
80727bf
Update UraniumChain.groovy
trainvoi Mar 7, 2024
b985e56
Merge pull request #780 from trainvoi/1.12.6-fixes
bruberu Mar 7, 2024
e16f399
fix some stoik
trainvoi Mar 9, 2024
02e117e
thallium chain from zinc
planetme Mar 9, 2024
93587c4
add thallium dust
planetme Mar 10, 2024
2f29f93
finish thallium and cadmium chain
planetme Mar 10, 2024
ad2d17c
fixed everything
planetme Mar 10, 2024
858149e
remove circuit 0
trainvoi Mar 11, 2024
f4d17fb
buff latex throughput
trainvoi Mar 11, 2024
2b12f55
fix PVB stoik and PVAc recipe for glue
trainvoi Mar 11, 2024
144291f
readd boiling recipe
trainvoi Mar 12, 2024
dfb78f2
restore PVB recipe to normal?
trainvoi Mar 12, 2024
7633bd2
radiator stuff
MCTian-mi Mar 15, 2024
018736f
fix
MCTian-mi Mar 15, 2024
0d83749
fix DTBP distillation recipe
trainvoi Mar 19, 2024
a67265c
fix br so2 recipe duration
planetme Mar 20, 2024
8f31f71
fix PVB
planetme Mar 20, 2024
c8cb5ab
Update AirDistillation.groovy
planetme Mar 20, 2024
18467fe
buh
planetme Mar 20, 2024
335cab2
Merge branch 'master-ceu' into pr/789
planetme Mar 20, 2024
2373798
Merge pull request #789 from trainvoi/1.12.6-fixes
planetme Mar 20, 2024
318759d
update mgf2 soln. volume convention
planetme Mar 20, 2024
f6b4a4e
Merge branch 'master-ceu' into germanium
planetme Mar 24, 2024
1397dd5
start germanium chain
planetme Mar 24, 2024
941a040
fix things
planetme Mar 24, 2024
53a3061
add waelz oxide proc chain
planetme Mar 24, 2024
269ea0e
add germanium/gallium route 2
planetme Mar 24, 2024
af5a441
finish up germanium
planetme Mar 25, 2024
57f5036
update argon-adjusted subcooling
planetme Mar 26, 2024
5261d98
coagulation tank thingy
MCTian-mi Mar 28, 2024
d4b4d72
allowing OC recipes to accept power unit regarless of the power units…
trainvoi Mar 28, 2024
564244f
finish indium
planetme Mar 29, 2024
a208f46
Merge pull request #810 from SymmetricDevs/indium
planetme Mar 29, 2024
ac4e29e
Merge branch 'master-ceu' into germanium
planetme Mar 29, 2024
9265f97
Merge branch 'germanium' of https://github.com/SymmetricDevs/Supersym…
planetme Mar 29, 2024
8526b9d
init commit
planetme Mar 29, 2024
a983619
outline selenium chain
planetme Mar 29, 2024
97b768f
outline tellurium line
planetme Mar 29, 2024
043ef1e
high purity tellurium outline
planetme Mar 29, 2024
746f5dc
outline high purity selenium
planetme Mar 29, 2024
d08fbf5
finish selenium & tellurium
planetme Mar 29, 2024
0428564
Merge pull request #811 from SymmetricDevs/selenium-tellurium
planetme Mar 29, 2024
885b8da
electrolysis overhaul exodus
planetme Mar 29, 2024
2c7fcaf
reorganization
planetme Mar 29, 2024
cc10d20
move paper chain
planetme Mar 29, 2024
5944735
reduce sulfur consumption for latex
MCTian-mi Mar 30, 2024
44c4bc7
fix Al2(SO4)3 stoik
trainvoi Mar 30, 2024
407fd50
outline caesium chain
planetme Apr 1, 2024
ead49cd
fix co2 dupe
planetme Apr 1, 2024
2b69d01
refactor alcohol & carboxylic acid processes, add formic acid chain
planetme Apr 1, 2024
cbe4a32
lepidolite line changes; rubidium line outline
planetme Apr 2, 2024
aea237e
IR config change in preperation
loxoDev Apr 5, 2024
0cf4a51
Update to SuSyCore 0.1.18
loxoDev Apr 6, 2024
9697328
Make track segments craftable
loxoDev Apr 6, 2024
3799ef3
Modify recipe for tracks and make the tunnel bore craftable
loxoDev Apr 6, 2024
730b0a4
finish caesium-rubidium
planetme Apr 7, 2024
3e8dc24
Merge pull request #819 from SymmetricDevs/cesium-rubidium
planetme Apr 7, 2024
09e323e
delete simplerpc
planetme Apr 7, 2024
df314f8
revert default quests changes
planetme Apr 7, 2024
6573e7b
Merge branch 'master-ceu' into germanium
planetme Apr 7, 2024
518b4bb
fix lang
planetme Apr 7, 2024
938c4d2
update black mesa
planetme Apr 7, 2024
25838d9
Merge branch 'master-ceu' into master-hotfixes
planetme Apr 7, 2024
648e2d2
turn cadmium sponge into le block, remove useless crude plat sponge
planetme Apr 7, 2024
c2cb3a8
update susycore (take 2)
planetme Apr 7, 2024
007e28e
Merge pull request #817 from SymmetricDevs/mt-update_susycore_0.1.18
planetme Apr 7, 2024
fcb30e1
Merge branch 'master-ceu' into germanium
planetme Apr 7, 2024
0614f95
Merge pull request #806 from SymmetricDevs/germanium
planetme Apr 7, 2024
c2e97ec
Merge branch 'master-ceu' into master-hotfixes
planetme Apr 7, 2024
cc8310a
Merge branch 'master-ceu' into master-hotfixes
planetme Apr 7, 2024
534005f
Merge branch 'master-hotfixes' into pr/809
planetme Apr 7, 2024
449f0a2
fixes
planetme Apr 7, 2024
d166919
Merge pull request #809 from trainvoi/1.12.6-hotfixes
planetme Apr 7, 2024
af257d4
Merge pull request #821 from SymmetricDevs/master-quests
bruberu Apr 7, 2024
1b01c0c
https://www.youtube.com/watch?v=VmGX-IVMpo0
bruberu Apr 7, 2024
e85f38e
Merge pull request #820 from SymmetricDevs/master-hotfixes
bruberu Apr 7, 2024
43b5d52
Merge branch 'master-ceu' into pr/808
planetme Apr 7, 2024
9afc792
remove latex for vulcanization
planetme Apr 7, 2024
14c9c87
Merge pull request #808 from MCTian-mi/coagulation-tank
planetme Apr 7, 2024
c2f95c6
Merge pull request #798 from MCTian-mi/radiator
bruberu Apr 8, 2024
8e9089e
add metaitems for tunnelbore
planetme Apr 8, 2024
c15741a
add new metaitems to tunnelbore recipe
planetme Apr 8, 2024
12a7e82
Tunnelbore recipes (MTBOs take)
loxoDev Apr 8, 2024
7a655a1
Merge branch 'mt-tunnelbore_recipes' of https://github.com/SymmetricD…
loxoDev Apr 8, 2024
e434e2f
Refactor internal naming and add localisation
loxoDev Apr 8, 2024
8d834cd
Small changes to recipes
loxoDev Apr 8, 2024
3d77961
Minor capitalisation mistake
loxoDev Apr 8, 2024
ff4a848
Merge pull request #822 from SymmetricDevs/mt-tunnelbore_recipes
planetme Apr 8, 2024
f8f587d
Mods update (#823)
MCTian-mi Apr 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions config/AppliedEnergistics2/AppliedEnergistics2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ client {

# Whether to add "Craftable" to item tooltips when they can be crafted automatically.
B:showCraftableTooltip=true

# Whether to show a preview of part and facade placement.
B:showPlacementPreview=true
B:useColoredCraftingStatus=true
B:useTerminalUseLargeFont=false
}
Expand Down Expand Up @@ -387,6 +390,7 @@ features {
craftingfeatures {
B:CraftingCPU=true
B:CraftingManagerFallback=true
B:CraftingToasts=true
B:MolecularAssembler=true
B:Patterns=true
}
Expand Down Expand Up @@ -425,6 +429,12 @@ features {


general {
# Max channel number may not exceed 256
I:denseChannelCapacity=32

# Max channel number may not exceed 256
I:normalChannelCapacity=8

# Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!
B:removeCrashingItemsOnLoad=false
}
Expand Down
235 changes: 235 additions & 0 deletions config/Universal Tweaks - Bugfixes.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
# Configuration file

general {

blocks {
# Fixes rendering issues with banners by correctly sizing their render bounding boxes
# Incompatible with RenderLib
B:"Banner Bounding Box"=true

# Fixes inconsistent delays of comparators to prevent redstone timing issues
B:"Comparator Timing"=true

# Only damage living entities hit by falling blocks, prevents killing items and XP
B:"Falling Block Entity Damage"=true

# Slims down the hopper bounding box for easier access of nearby blocks
B:"Hopper Bounding Box"=true

# Prevents crashes when the destination tile entity becomes unavailable during the item insert process
# Mainly utilized to suppress edge case symptoms with Thaumcraft's Thaumatorium
B:"Hopper Insert Safety Check"=true

# Prevents voiding held items when right + left clicking on an item frame simultaneously
B:"Item Frame Void"=true

# Disables climbing movement when flying
B:"Ladder Flying Slowdown"=true

# Avoids the need for multiple mining attempts by sending additional movement packets
B:"Mining Glitch"=true

# Properly saves the last state of pistons to tags
B:"Piston Progress"=true

# Improves retraction behavior on double piston extenders
B:"Piston Retraction"=false

# Fixes sleeping always resetting rain and thunder times
B:"Sleep Resets Weather"=true

"block overlay" {
# Fixes x-ray when standing in non-suffocating blocks
B:"[1] Block Overlay Toggle"=true

# Excludes blocks from the block overlay bugfix
# Syntax: modid:block
S:"[2] Blacklist" <
>

# Includes blocks in the block overlay bugfix
# Syntax: modid:block
S:"[3] Whitelist" <
>
}

}

entities {
# Improves the attack radius of hostile mobs by checking the line of sight with raytracing
B:"Attack Radius"=true

# Prevents fire projectiles burning entities when blocking with shields
B:"Block Fire"=true

# Fixes entities glitching through the bottom of boats
B:"Boat Riding Offset"=true

# Replaces linked entity AI task sets with concurrent sets to avoid mod exception concerning entity AI
# Only enable this if you're facing concurrent modification exceptions with entity AI tasks, for example Thaumcraft's Pechs
B:"Concurrent Entity AI Tasks"=false

# Fixes corrupted entities exceeding the allowed death time
B:"Death Time"=true

# Fixes lag caused by dead entities by sending additional packets when the player is not alive
B:"Destroy Entity Packets"=true

# Fixes missing player states when changing dimensions by sending additional packets
B:"Dimension Change Player States"=true

# Fixes item duplications when players are dropping items and disconnecting
B:"Disconnect Dupe"=true

# Fixes a duplication exploit connected to the inventories of donkeys and mules
B:"Donkey/Mule Dupe"=true

# Fixes consuming an item having a chance of also consuming a second item without any animation
B:"Double Consumption"=true

# Relocate elytra deployment and landing to client side to prevent issues with high latencies
B:"Elytra Deployment & Landing"=true

# Saves entity bounding boxes to tags to prevent breakouts and suffocation
B:"Entity Bounding Box"=true

# Fixes non-functional elytra firework boosting and guardian targeting if the entity ID is 0
B:"Entity ID"=true

# Fixes entity lists often not getting updated correctly
B:"Entity Lists"=true

# Prevents corruption of entities caused by invalid health or damage values
B:"Entity NaN Values"=true

# Pushes entities out of blocks when growing up to prevent suffocation
B:"Entity Suffocation"=true

# Fixes entity tracker to prevent client-sided desyncs when teleporting or changing dimensions
# Incompatible with SpongeForge
B:"Entity Tracker"=true

# Changes UUIDs of loaded entities in case their UUIDs are already assigned (and removes log spam)
B:"Entity UUID"=true

# Modifies falling logic of horses, listening to LivingFallEvent and taking jump boost into account
B:"Horse Falling"=true

# Corrects maximum player health on joining by setting the last saved health value
B:"Max Player Health"=true

# Fixes non-player entities being able to control minecarts
B:"Minecart AI"=true

# Fixes mounts and boats sometimes disappearing after dismounting
B:"Mount Desync"=true

# Fixes saturation depleting in peaceful mode
B:"Player Saturation"=true

# Fixes a duplication exploit connected to shearing mooshrooms
B:"Shear Mooshroom Dupe"=true

# Fixes skeletons not looking at their targets when strafing
B:"Skeleton Aim"=true

# Fixes untipped arrows emitting blue tipped arrow particles upon reloading a world
B:"Untipped Arrow Particles"=true

# Returns missing hoods to villager mantles
B:"Villager Mantle Hoods"=true

"entity desync" {
# Fixes entity motion desyncs most notable with arrows and thrown items
# Incompatible with Immersive Vehicles
B:"[1] Entity Desync Toggle"=true

# Syntax: modid:entity
# Example: minecraft:minecart
S:"[2] Entity Blacklist" <
minecraft:minecart
>
}

}

misc {
# Improves the accuracy of smooth lighting by checking for suffocation and light opacity
B:"Accurate Smooth Lighting"=true

# Fixes the blast protection enchantment not reducing knockback from explosions except at very high levels
B:"Blast Protection Knockback"=false

# Fixes crafted item statistics not increasing correctly when items are crafted with shift-click or drop methods
B:"Crafted Item Statistics"=true

# Fixes entity and particle rendering issues by enabling depth buffer writing
B:"Depth Mask"=true

# Replaces the help command, sorts and reports broken commands
B:"Help Command"=true

# Prevents various crashes with Turkish locale
B:"Locale Crash"=true

# Increases the packet size limit to account for large packets in modded environments
# Vanilla default is 0x200000
# Incompatible with SpongeForge and RandomPatches
I:"Packet Size"=16777216

# Fixes various particle types not showing up on the client
B:"Particle Spawning"=true

# Fixes potion effects not displaying their level above 'IV'
B:"Potion Amplifier Visibility"=true

# Fixes the spectator menu not showing player skins
B:"Spectator Menu"=true

"model gap" {
# Fixes transparent gaps in all 3D models of blocks and items
B:"[1] Model Gap Toggle"=true

# Quad X/Y offset
# Moves the quad toward the center of the item
# Use to hide gaps, keep as close to 0 as possible
D:"[2] Recess Value"=0.007

# Quad expansion increment
# Enlarges each quad
# Use to hide gaps, keep as close to 0 as possible
D:"[3] Expansion Value"=0.008
}

}

world {
# Fixes loading of outdated chunks to prevent duplications, deletions and data corruption
# Incompatible with SpongeForge
B:"Chunk Saving"=true

# Fixes invisible chunks in edge cases (small enclosed rooms at chunk borders)
B:"Frustum Culling"=true

# Fixes duplication issues that can occur when entities travel through portals
B:"Portal Traveling Dupe"=true

# Changes the data table of tile entities to resolve issues
# HASHMAP: Vanilla default
# LINKED_HASHMAP: Keeps the loading order of tile entities to prevent issues during the first ticks of chunk loading
# CONCURRENT_HASHMAP: Allows simultaneous access to tile entities to prevent concurrent modification exceptions
# CONCURRENT_LINKED_HASHMAP: Combines LINKED_HASHMAP and CONCURRENT_HASHMAP, may have random side effects
# Valid values:
# HASHMAP
# LINKED_HASHMAP
# CONCURRENT_HASHMAP
# CONCURRENT_LINKED_HASHMAP
S:"Tile Entity Map"=LINKED_HASHMAP

# Fixes witch hut structure data not accounting for the height it is generated at
B:"Witch Huts"=true
}

}


18 changes: 18 additions & 0 deletions config/Universal Tweaks - General.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Configuration file

general {

debug {
# For those who live life on the edge, may or may not include Jons
B:"Bypass Incompatibility Warnings"=false

# Enables debug logging
B:"Debug Logging"=false

# Prints the time the game needed to launch to the log
B:"Show Loading Time"=true
}

}


Loading
Loading