...lmao. - #2764
Closed
AngeliaDusk wants to merge 98 commits into
Closed
...lmao.#2764AngeliaDusk wants to merge 98 commits into
AngeliaDusk wants to merge 98 commits into
Conversation
* QB Tweaks and Fixes (Omicron-Industries#2451) * QB Tweaks and Fixes * go back to normal turbo chargers dont remember why i changed these in the first place * change other lang files * update gtm to 7.5.1 (and addons) (Omicron-Industries#2482) * update gtm to 7.5.1 (and addons) also includes autogenerated changes in some mod configs :thumbtel: * Revert "update gtm to 7.5.1 (and addons)" This reverts commit d5478ca. * updated pack from (new) manifest, now only jade config auto-updates * Change PR to update to 7.5.2 --------- Co-authored-by: Xefyr0 <78383477+Xefyr0@users.noreply.github.com> * Update Forge installer version in README (Omicron-Industries#2487) * Band-aid fixing the broken platinum ore recipe (Omicron-Industries#2490) * Merge branch lang * Integral components tweaks (Omicron-Industries#2502) * Tweak Integral Components' progression * Update lang to match integral components' changes * Add PECA and PEEK variants to Electo-Optic Modulator (Omicron-Industries#2496) * update monilabs to 0.21.0 (Omicron-Industries#2508) * also adds recipes for the new advanced hatches * Add Project Red (Omicron-Industries#2480) * Add ProjectRed as a fully-fledged mod to the pack * Make the Illumination module optional * Merge branch lang * Update Monifactory_titlescreen_text.md I forgot to update this before :sobeline: This should reach the people who aren't in the discord. * update monilabs to 0.21.2 (Omicron-Industries#2515) * hotfix stuff for advanced sensor hatches * Copy over everything related to the PSoC diagrams (Omicron-Industries#2514) * Fix `"set-output" command is deprecated` in CI (Omicron-Industries#2509) * chore: upgrade versions of upstream actions * Merge branch lang --------- Co-authored-by: Release workflow <ThePansmith@users.noreply.github.com> * Implement Wither Gas * Tweak Alkylbenzene sulfonate recipe * Change recipe chain for more realism --------- Co-authored-by: PlasmaticVoide <145876536+PlasmaticVoide@users.noreply.github.com> Co-authored-by: NegaNote <neganote43@gmail.com> Co-authored-by: Fliptrack <58639522+Fliptrack@users.noreply.github.com> Co-authored-by: bjl32 <u.bjl32@outlook.com> Co-authored-by: Release workflow <ThePansmith@users.noreply.github.com> Co-authored-by: WithersChat <76114055+WithersChat@users.noreply.github.com> Co-authored-by: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Co-authored-by: iluha168 <illya.chernyshov888@gmail.com>
This reverts commit d453cf3.
…g_lines_scramble Merging proc line rework progress into a singular 0.14 branch.
Does several things to make RTM coils more worthwhile to invest in on the way to HSS-G: - Shorten RTM alloy's blast time - Replace Tungsten in HSS-G coils' recipe with Ruthenium - Changes Tungsten and its alloys to require RTM alloy coils or higher - (RTM coils are needed for Tungstensteel in Nomi CE, after all) - Make Molybdenum and Tungsten (Key elements of HSS-G) slower to get from Microminers
Abridge CFA Line
Including but not limited to: - Un-nuke Thermal's Magma Crucible as yet another method to produce Lava (but it's harder to scale due to not being GT) - Add Barite to Glowstone composition and add a recipe to synthesize Barite dust using Barium and Sulfuric Acid so earlygame players can reasonably synthesize the stuff - Move Thermal's Insightful Crystal from Crafting Table to HV Autoclave with tier-appropriate recipe - Add Stainless Steel Plates to Advanced Thermal RF/tank augments - Change around Thermal Dynamo and Boiler recipes slightly so that the Boiler counterparts can crafted directly and keep bidirectional conversion recipes without any difference in material cost - Remove Mythril and Stainless Steel from the Thermal Machine Frame, (replaced with Aluminium and Iron respectively) thereby making all Thermal Expansion machines accessible in LV which gives them more time to be relevant before they inevitably get outcompeted - Change Vacuumulator recipe to not require the EnderIO Vacuum Chest - Add a bunch of other basic-ish recipes to the Igneous Extruder (Granite, Diorite, Andesite, Calcite, Stone) - Recipes to make Rockwool from Asbestos, Basalt, or Silica and some other random rock-themed items
* Ender Storage changes * Move Ender Storage a bit later in progression
…ies#2522) * Rebalance remaining plasmas and add Beryllium Plasma * Partially revert the nerf to Tritium from Ender Air distillation
* Get rid of Ethyl Cyanoacetate intermediate * Increase consumption of Dimethyl Sulfoxide to be less negligible * Fix PECA stoich to not void Chlorine * Fix Withers' merge * Remove Cracking step from PECA * Change PECA polymerization to use less water --------- Co-authored-by: WithersChat <76114055+WithersChat@users.noreply.github.com>
* Make PEEK slightly shorter * Remove lang keys for removed materials
* Nuke GT World Accelerators * Remove Right Hand of Chronos quest for World Accelerators
* Xefyr goes on a Chemistry Bender
From Dimethylbenzene (I forgor Oxygen was monoatomic)
…micron-Industries#2743) * T3.5 * The end of T3.5 MM
…on-Industries#2746) * Make all MAX items except for 2A Energy Hatch gated behind MAX-tier power * Make Causality-Exempty Heavy Monic Plating MAX-gated
* update gtmutils to 2.10.1 * fixes * qb side * make the quests optional because they are mode dependent * forgot to make the naq frames optional --------- Co-authored-by: PlasmaticVoide <145876536+PlasmaticVoide@users.noreply.github.com> Co-authored-by: Xefyr0 <78383477+Xefyr0@users.noreply.github.com>
* Create integrateddynamics.js * Add ability to buy Menril Saplings I checked all the other recipes in the Monicoins folder and found 0 conflicts for this pattern of Monipennies. * Add Menril Saplings to Greenhouse. * Add certain Integrated Dynamics/Tunnels to Item NukeList * Add Liquid Chorus to Fluid NukeList. * Angelia Dusk fails Lint Checks once again * Add ID Config to remove spawning in with book * Add tooltip to ID Guide Book * Add ID en_us.json * Add ID/T compat to README * Remove ID/T stuff from Fluid nukeList * Re-add World Importers/Exporters (except Energy) * Several changes. Adds Chorus processing and stuff. Adds recipes for World Importers/Exporters (didn't even have to remove recipes likely due to still nuking Chorus crafting components, but all the blocks are still here). Makes Static Light Panels give 4x the amount per recipe, and doubled the amount of AE2 Light Panels per recipe to slightly compensate. * Swap 5 quadrillion lines dedicated to Cutting for a function dear god i'm so gonna get lint check failed lmfao * Lint
* Add lube_from_other_oils.js
* Gate Tungsten behind Microminers
* Add "Disabled Card" tooltip * Add Advanced AE stuff to nukeList * Add Advanced AE to nukeList * Add HP and Regen cards because they don't make sense in Moni's playstyle * Add Quantum Armour as being Space armour * Create Advanced AE compat file * Add files via upload * Add files via upload * Link check, bloody hell * Link check * Dryer lint * we love lint right * Makes the Storage components not hyper-expensive Reduces 256M Storage Component cost per 256M Quantum CPU Storage Block from 2 to 1 Reduces 256M Quantum CPU Storage Block cost of Quantum Data Entangler from 32 to 2 * Forgot a semicolon, my apolocheese * Forgot a semicolon, my apolocheese * Swaps Crafting recipe variables to be normal I was originally going off of another file for context, with a completely insane variable setup for its crafting recipes, so I sorta assumed that was the standard, but then I saw this format being used elsewhere and decided to update it here retroactively too. * Lint. * Add Auto Feeding Card to Disabled Card list * Changes to Cards, Glass, and Quantum CU Quantum Crafting Unit and Quantum Computer Structural Glass have had their Solder costs swapped (144L/72L respectively instead of 72L and 144L...because that made sense) Removes Auto Feeding Card Adds 2x Netherite Ingots to Lava Immunity Card, adds 4x Golden Carrots to Night Vision Card, and adds an IV Sensor to the ME Recharging Card * Removes Advanced AE from Fluid NukeList * Re-add Quantum Infusion and implement it into a few recipes But like, mostly AssLine ones. Advanced Solder haters aren't getting off that easily :3 (I'm kidding...well, mostly.) * Push Quantum Armour into spaceImmuneEquipment instead * Optional Compat 10 --------- Co-authored-by: WithersChat <76114055+WithersChat@users.noreply.github.com>
and reduce Raw Oil frequency
* Remove the obsolete QB line about an Americium Plasma requirement for Hadal Sculk * Fix quest file formatting for the Laser Node quest * Move Advanced Ore Processing quest so it doesn't overlap others * Tweaks to backpack quests * Add quest about sufluric ore pyrometallurgy * Simplify and update the Steam Separator quest * Add a quest about Tectonic Grenades
* Improve Genesis introduction to EU power * Improve The Factory introduction to EU * Add more detail on the explanation for recipe tiers * Update EBF quest to provide better advice for powering it * Remove Benzene fuel recommendation from QB * Explain generator overclocking for combustion gens too * Add some additional information to the multi-amp hatches quest * Expand and improve the Centralized Power quest * Add a note about energy draw with parallels * Push for recommended methods of power distribution a little harder * semi-related fixes * Add a note on how and when to use RF power
* Remove a bunch of rotors for being noob traps or fluff * Add some new rotors in more useful spots in progression * Balance the rest of the fucking rotors * Buff LuV-ZPM rotors * Clarify a comment * Remove Chromium turbine rotor * Further balance tweaks * Further adjustments to mid- and late-game rotors so HSS ones aren't nerfed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ignore, was eepy and PR'd to main instead of 0.14-dev.