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

syncing progress #1092

Merged
merged 47 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
2c2fef1
Add cyberzombie invasions in the nether
Oct 19, 2024
808e6d9
Add fire resistance to cyberzombies.
Oct 20, 2024
cffa725
Remove cyberzombie invasions.
Oct 21, 2024
456a429
Forgot to remove the library.
Oct 21, 2024
37277fb
add quest for graduated cylinders
MCTian-mi Oct 26, 2024
f7499d7
add Graduated Cylinders
MCTian-mi Oct 21, 2024
5438ac8
update VisualOres
MCTian-mi Oct 21, 2024
776b5db
improve visualores display
MCTian-mi Oct 19, 2024
55ceb1e
change the threshold of bogosorter tool refill to 0 so you won't have…
MCTian-mi Oct 19, 2024
a2a6dc4
add anvil recipe for pig iron -> wrought iron
MCTian-mi Oct 19, 2024
f0c8fd8
move medium zombie invasion advancement lock to the wrench advancement
MCTian-mi Oct 26, 2024
32fda1d
change pyrotech cog recipe
MCTian-mi Oct 26, 2024
558ec0b
alloy smelter recipe changes
MCTian-mi Oct 26, 2024
72d649c
add slag glass recipes in alloy furnace
MCTian-mi Oct 26, 2024
0d77613
change some recipes to accept ore('blockGlass') instead of vanilla gl…
MCTian-mi Oct 26, 2024
63d8bb3
:cringe:
MCTian-mi Oct 26, 2024
9bddb26
quest fixes
MCTian-mi Oct 26, 2024
49adfe4
nerf coke oven a little
MCTian-mi Oct 26, 2024
44b2f53
increase back some slag output
MCTian-mi Oct 26, 2024
7446b27
fix H20 issue (wow there's another one)
MCTian-mi Oct 26, 2024
8634d9a
add formula to cobalt matte
MCTian-mi Oct 26, 2024
15f69c5
allows alloying recipes to use all kinds of fuels
MCTian-mi Oct 27, 2024
cc96744
updates BQu
MCTian-mi Oct 27, 2024
9758a78
oops
MCTian-mi Oct 27, 2024
22f6c1b
remove Tetrahedrite and Bornite smelting
MCTian-mi Oct 27, 2024
c77bfd2
more quest fixes
MCTian-mi Oct 27, 2024
ff22440
allows igniting pyrotech furnaces with GT items
MCTian-mi Oct 27, 2024
89caf01
add warning
MCTian-mi Nov 2, 2024
f2a7532
updates Universal Tweaks (and configs)
MCTian-mi Nov 2, 2024
ef5a2b4
make MonumentSpire non-rotatable
MCTian-mi Nov 2, 2024
be003f3
remove furnace from TinyStash
MCTian-mi Nov 2, 2024
086394b
add ground/loots to SupportBeamThing
MCTian-mi Nov 2, 2024
89903e9
gocha
MCTian-mi Nov 2, 2024
4425a20
add recipe for large pump
trainvoi Nov 2, 2024
73df6b4
un-nerf ignition
MCTian-mi Nov 3, 2024
6ecbd3c
add pyrotech leather processing recipes
MCTian-mi Nov 3, 2024
b668d89
potin quest
MCTian-mi Nov 3, 2024
bd03d8d
Update SuSyCore and Gregic Probe
bruberu Nov 4, 2024
575a327
Merge pull request #1037 from MCTian-mi/mod-updates
bruberu Nov 4, 2024
a4d1677
Merge pull request #1089 from trainvoi/pump-controller-recipe-redone
bruberu Nov 4, 2024
e6662fe
sorry I forgor
MCTian-mi Nov 4, 2024
ec3b87b
fix: minor spelling error
bruberu Nov 4, 2024
7e916bc
Merge pull request #1044 from MCTian-mi/pyrotech-polishments
bruberu Nov 4, 2024
7ed4720
Remove installing java
bruberu Nov 4, 2024
baf5e4c
Merge pull request #1091 from SymmetricDevs/bru-fix-PR
MCTian-mi Nov 4, 2024
fd8c4bb
Merge branch 'master-ceu' into cyberzombies
bruberu Nov 4, 2024
3260116
Merge pull request #1036 from saldejums/cyberzombies
bruberu Nov 4, 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
7 changes: 1 addition & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ jobs:
- name: Install requests
run: |
pip install requests
- uses: actions/setup-java@v2
with:
distribution: 'adopt' # See 'Supported distributions' for available options
java-version: '8'
- run: java -version
- name: Run Build
run: |
python build/main.py
Expand Down Expand Up @@ -65,4 +60,4 @@ jobs:
buildOut/supersymmetry-${{steps.get-version.outputs.result}}.zip
buildOut/server-${{steps.get-version.outputs.result}}.zip
buildOut/modlist.html


10 changes: 1 addition & 9 deletions config/Universal Tweaks - Bugfixes.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ general {
B:"Crafted Item Statistics"=true

# Fixes entity and particle rendering issues by enabling depth buffer writing
# Can cause issues with modded particles
B:"Depth Mask"=true

# Replaces the help command, sorts and reports broken commands
Expand All @@ -201,17 +202,8 @@ general {
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
}

Expand Down
75 changes: 67 additions & 8 deletions config/Universal Tweaks - Mod Integration.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ general {
# Fixes various duplication exploits
B:"Duplication Fixes"=true

# Sets what level of Particles Setting is required to disable the Item Particles generated by Item Lasers transferring items
# The config setting here is complex due to how Vanilla Minecraft handles the Particles setting
# -1 or lower will not register the mixin
# 0 disables the creation of these particles entirely
# 1 disables the creation of these particles when the Particle setting is on Minimal only
# 2 disables the creation of these particles when the Particle setting is on Decreased or Minimal
# 3 or higher will never disable these particles
I:"Item Laser Particles Graphics"=-1

# Fixes Laser Upgrades voiding instead of applying if there is only one item in the stack
B:"Laser Upgrade Voiding"=true
}
Expand All @@ -38,10 +47,11 @@ general {
# Fixes various duplication exploits
B:"Duplication Fixes"=true

# Fixes memory leak when unloading worlds/switching dimensions
B:"Memory Leak Fix"=true

# Optimizes the Hellfire/Soul Forge to reduce tick time
B:"Optimized Hellfire Forge"=true

# Fixes memory leak when unloading worlds/switching dimensions
B:"World Unload Memory Leak Fix"=true
}

Expand Down Expand Up @@ -74,6 +84,9 @@ general {
"elementary staffs" {
# Reintroduces the 1.5 electric staff behavior along with some subtle particles
B:"Electric Staff Port"=true

# Lets the health staff also heal other players (and potentially more living entities)
B:"Health Staff Player Healing"=true
}

"elenai dodge 2" {
Expand Down Expand Up @@ -117,6 +130,9 @@ general {
# Fixes the Creative Mill Generator not respecting the Creative Block Breaking config
B:"Creative Mill Harvestability"=true

# Downgrades the message when creating a potion recipe from info to a debug
B:"Downgrade Potion Recipes Log Level"=true

# Fixes various duplication exploits
B:"Duplication Fixes"=true

Expand Down Expand Up @@ -275,24 +291,18 @@ general {
}

thaumcraft {
# Fixes various duplication exploits
B:"Duplication Fixes"=true

# Fixes the bounding box always being at the center in both cinderpearls and shimmerleafs
B:"Flower Bounding Box"=true

# Stops the thaumometer from bobbing rapidly when using it to scan objects
B:"Stable Thaumometer"=true
}

"thaumcraft: entities" {
# Adds particles to firebats similar to legacy versions
B:"Firebat Particles"=true

# Rotates dead eldritch crabs all the way like endermites, silverfish, and spiders
B:"Spiderlike Eldritch Crabs"=true

# Increases particle size of wisps similar to legacy versions
B:"Wisp Particles"=true
}

Expand Down Expand Up @@ -455,8 +465,16 @@ general {
}

"compact machines" {
# Improves server performance by properly controlling spawn checks (effectiveness depends on CM's config)
# Disable both 'allowHostileSpawns' and 'allowPeacefulSpawns' in the CM config for best performance
# Does nothing if both config values are true
B:"Allowed Spawns Improvement"=true

# Fixes some compact machine walls being invisible if Nothirium 0.2.x (and up) or Vintagium is installed
B:"Invisible Wall Render Fix"=true

# Fixes client-side memory leak associated with miniaturization recipes
B:"Memory Leak Fix"=true
}

"effortless building" {
Expand Down Expand Up @@ -526,6 +544,47 @@ general {
B:"Sky of Old Dimension Fix"=true
}

bibliocraft {
# Fixes client-side memory leak by disabling version check
B:"Disable Version Check"=true
}

collective {
# Fixes memory leak when unloading worlds/switching dimensions
B:"Memory Leak Fix"=true
}

emojicord {
# Improves emoji context calculation to improve fps when rendering a lot of text
B:"Emoji Context"=true
}

"ender io" {
# Fixes client-side memory leak by replacing obelisk renderer with a simpler one
B:"Replace Obelisk Renderer"=true
}

"in control!" {
# Fixes onJoin spawn rules repeatedly modifying mob attack/health/speed
B:"Spawn Rule Stats Fix"=true
}

"iron chests" {
# Fixes client-side memory leak by replacing the crystal chest/shulker box renderer with a simpler one
# Note: Stack sizes are not rendered, similar to modern versions of this mod
B:"Replace Crystal Chest/Shulker Renderer"=true
}

"random things" {
# Fixes a bug where crafting the output of an Anvil recipe would modify the recipe, preventing crafts until restart
B:"Anvil Crafting Fix"=true
}

woot {
# Remove any leftover entities spawned on simulated mob's death
B:"Cleanup Simulated Kills"=true
}

}


89 changes: 81 additions & 8 deletions config/Universal Tweaks - Tweaks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ general {
# Controls if the observer activates itself on the first tick when it is placed
B:"Prevent Observer Activating on Placement"=false

# Lets projectiles like arrows bounce off slime blocks
B:"Projectiles Bounce Off Slime Blocks"=false

# Controls if the End Portal renders its texture on the bottom face
B:"Render End Portal Bottom"=true

Expand Down Expand Up @@ -295,22 +298,49 @@ general {
attributes {
# Sets custom ranges for entity attributes
B:"[01] Attributes Toggle"=true

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[02] Max Health Min"=-65536.0
D:"[03] Max Health Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[04] Follow Range Min"=-65536.0
D:"[05] Follow Range Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[06] Knockback Resistance Min"=-65536.0
D:"[07] Knockback Resistance Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[08] Movement Speed Min"=-65536.0
D:"[09] Movement Speed Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[10] Flying Speed Min"=-65536.0
D:"[11] Flying Speed Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[12] Attack Damage Min"=-65536.0
D:"[13] Attack Damage Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[14] Attack Speed Min"=-65536.0
D:"[15] Attack Speed Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[16] Armor Min"=-65536.0
D:"[17] Armor Max"=65536.0

# Min: 0.0
# Max: 1.7976931348623157E308
D:"[18] Armor Toughness Min"=-65536.0
D:"[19] Armor Toughness Max"=65536.0
D:"[20] Luck Min"=-65536.0
Expand All @@ -335,11 +365,7 @@ general {
}

"collision damage" {
# Applies horizontal collision damage to the player akin to elytra collision
B:"[1] Collision Damage Toggle"=false

# The damage factor that gets multiplied with the player speed
# Vanilla default for elytra damage is 10
I:"[2] Damage Factor"=10
}

Expand Down Expand Up @@ -422,6 +448,9 @@ general {
# Disables skipping night by using a bed while making it still able to set spawn
B:"Disable Sleeping"=false

# Disables setting the spawn point by using a bed while making it still able to sleep
B:"Disable Sleeping Setting Spawn"=false

# Determines at which time of day sleeping is allowed in ticks (0 - 23999)
# -1 for vanilla default
# Min: -1
Expand Down Expand Up @@ -634,6 +663,9 @@ general {
# Prevents placing of liquid source blocks overriding portal blocks
B:"Prevent Placing Buckets in Portals"=false

# Requires the hunger bar to be missing food points equal to or more than the amount restored by the food
B:"Smart Eat"=false

# Enables one-time ignition of entities by hitting them with a torch
B:"Super Hot Torch"=false

Expand Down Expand Up @@ -830,8 +862,6 @@ general {

# Disables potion effect particles emitting from yourself
B:"Hide Personal Effect Particles"=false

# Provides more information to addPacket removed entity warnings
B:"Improved Entity Tracker Warning"=true

# Lets background music play continuously without delays
Expand Down Expand Up @@ -873,6 +903,7 @@ general {
B:"Prevent Keybinds from Overflowing Screen"=true

# Removes the 3D Anaglyph button from the video settings menu
# Incompatible with OptiFine
B:"Remove 3D Anaglyph Button"=true

# Removes the redundant Minecraft Realms button from the main menu and silences notifications
Expand Down Expand Up @@ -981,14 +1012,14 @@ general {
S:"[1] Mode"=NOTHING

# Sounds to play when Minecraft is loaded
# Syntax: eventname;pitch
# Syntax: eventname;pitch;volume
S:"[2] Minecraft Loaded Sounds" <
entity.experience_orb.pickup;1.0
entity.player.levelup;1.0
>

# Sounds to play when the world is loaded
# Syntax: eventname;pitch
# Syntax: eventname;pitch;volume
S:"[3] World Loaded Sounds" <
entity.experience_orb.pickup;1.0
entity.player.levelup;1.0
Expand Down Expand Up @@ -1086,6 +1117,12 @@ general {
# Syntax: modid:block
S:"[3] Whitelist" <
>

# Excludes items from the swing through grass tweak
# Syntax: modid:item
S:"[4] Item Blacklist" <
erebus:wand_of_animation
>
}

"toast control" {
Expand Down Expand Up @@ -1166,6 +1203,21 @@ general {
B:"[3] Compact Messages"=false
}

"connection timeouts" {
# Allows configuring read/login timeouts.
# If you are having trouble logging into a server of a large modpack, try changing the timeouts below.
B:"[1] Connection Timeouts Toggle"=true

# The connection read timeout in seconds.
# This value is used on both client and server.
# On the server, also extends the time allowed to respond to a KeepAlive packet.
I:"[2] Read Timeout"=90

# The login timeout in seconds. (Vanilla default: 600 ticks, or 30 secs)
# Only used on the server.
I:"[3] Login Timeout"=90
}

}

performance {
Expand All @@ -1176,6 +1228,7 @@ general {
B:"Check Animated Models"=true

# Adds an IRecipe cache to improve recipe performance in larger modpacks
# Incompatible with KemonoCraft
B:"Crafting Cache"=true

# Improves loading times by removing debug code for missing sounds and subtitles
Expand All @@ -1187,6 +1240,9 @@ general {
# Improves rendering performance by disabling rendering the entity inside mob spawners
B:"Disable Mob Spawner Entity"=false

# Prevents Rain and Snow Particles from rendering when Raining or Thundering
B:"Disable Rain Particles"=false

# Replaces color lookup for sheep to check a predefined table rather than querying the recipe registry
B:"Fast Dye Blending"=true

Expand All @@ -1198,9 +1254,11 @@ general {
B:"Fast World Loading"=true

# Fixes slow background startup edge case caused by checking tooltips during the loading process
# May have side effects concerning tooltips
B:"Faster Background Startup"=true

# Improves the speed of switching languages in the Language GUI
# Incompatible with OptiFine
B:"Improve Language Switching Speed"=true

# Improves the speed of connecting to servers by setting the InetAddress host name to the IP in situations
Expand Down Expand Up @@ -1338,6 +1396,21 @@ general {
I:"[9] Particle Spawn Y Level"=8
}

"cave generation" {
# Sets custom values for the vanilla cave generation
B:"[1] Cave Generation Toggle"=false

# Size of cave systems
# 40 for pre-1.7 generation
# 15 for vanilla default
I:"[2] Cave Size"=15

# Chance for generating cave systems
# 15 for pre-1.7 generation
# 7 for vanilla default
I:"[3] Cave Rarity"=7
}

}

}
Expand Down
Loading
Loading