50 Commits

Author SHA1 Message Date
b70646b32d Gregified new immersive vehicle recipes 2025-01-07 23:59:45 -06:00
a810b3aa2b Fixed minecart steel wheels recipe collision 2025-01-07 17:03:08 -06:00
98296a4f96 Changed BoP wood recipes 2025-01-07 17:02:28 -06:00
3ced128b72 Changed minecart wheels recipe for piston conflict 2025-01-07 12:16:11 -06:00
0a5d274bce Opencomputers control unit recipe conflict with mv circuit 2025-01-04 12:10:01 -06:00
79d60e4acd ImmersiveVehicles seatbench Buzzsaw -> BuzzSaw 2025-01-02 22:03:59 -06:00
51d74f06a5 immersiveVehicles piston recipe conflict 2025-01-02 17:18:39 -06:00
155dab9a50 immersiveVehicles.groovy replace thermal expansion tank with gt drum 2024-12-31 17:38:14 -06:00
5082942bb2 added immersive vehicles 2024-12-18 16:17:19 -06:00
ecc2352c19 Added opencomputer recipe overrides 2024-12-13 13:20:30 -06:00
Integer Limit
86cb1fbf85
Allow Usage of Fluid Containers in Crafting (#1142)
This PR allows the usage of any fluid container, such as GT cells and drums, or EIO portable tanks, or Thermal portable tanks, in crafting recipes involving buckets.

This is done through mass recipe replacing, replacing ingredients with a custom 'fluid bucket ingredient'. This ingredient also displays some options for containers in JEI, allowing for crafting auto-fill.

Some recipes have been changed:
- Cake + Cake Base + Chocolate Cake now supports dough or rice dough
- Cake + Cake Base no longer allow using unfilled buckets
- Concrete Bucket (for Firebricks Recipe) change:
	- Now makes Concrete Cell (Iron)
	- Takes a cell as input, and any fluid container (for water) as input
- New Recipe: Water + Lava = Obsidian

Reviewers:
- Anything else we should add to the display list? Should we remove something?
- Any recipes that are not replaced?
- Check for bugs involving crafting, e.g. crash, dupe, unexpected behaviours.

[EXPAND]
[[messages]]
messageBody = '''
[FEATURE]
[DETAILS]
details = [
"Allows using ANY Fluid Container (GT Drums/Cells, EIO Tanks, Thermal Tanks, etc.) in Crafting Recipes, Substituting Filled Buckets",
"Also adds Crafting Recipe for Obsidian (Water + Lava)"
]
[DETAILS]
'''

[[messages]]
messageTitle = "Revamp Concrete Bucket Crafting Recipe"
messageBody = '''
[BALANCING]
[HM]
[DETAILS]
detail = "Now takes an Empty Cell as Input, and outputs a Filled Cell"
[DETAILS]
'''
[EXPAND]
2024-12-11 09:11:28 +11:00
Integer Limit
4166fd3454
Hide EIO Lava Generator JEI Category (#1145)
[SKIP]
2024-12-09 22:36:27 +11:00
Integer Limit
7a8e7619ae
Add Creosote & Concrete Buckets to JEI (#1140)
[FEATURE]

[DETAILS]
detail = "They are used in some Crafting Recipes."
[DETAILS]
2024-12-08 21:33:16 +11:00
Integer Limit
a786702ddf
Remove Unused Import (#1130)
[SKIP]
2024-12-02 11:06:34 +11:00
Integer Limit
9474cca4c5
Misc Thermal Expansion Improvements (#1127)
## Bug Fixes:
- Fixes Issues displaying JEI Creative Cell's recipes in JEI

## Features:
- Removes Creative Tank and Machines from JEI
- Cleans up Upgrade Recipes
  - Fixes Duplicated and Cluttered Upgrade Recipes
  - Adds Upgrade Recipes for Dynamos, Tanks, and Full Conversion Options for Cells

## Balancing:
- Changes Portable Tank Upgrade Recipes
  - Now takes Upgrade/Conversion Kits instead of Custom Materials
  - Portable Tanks could be upgraded with Kits as Placed Blocks Previously
  
## Internal:
- Cleans up Thermal JEI Hiding

[EXPAND]
[[messages]]
messageBody = '''
[BUG]
[DETAILS]
detail = "Fixes Issues displaying JEI Creative Cell's recipes in JEI"
[DETAILS]
'''

[[messages]]
messageBody = '''
[FEATURE]
[DETAILS]
details = [
"Removes Creative Tank and Machines from JEI",
"Cleans up Thermal Upgrade Crafting Recipes",
["Fixes Duplicated and Cluttered Upgrade Recipes",
"Adds Upgrade Crafting Recipes for Dynamos and Portable Tanks"],
]
[DETAILS]
'''

[[messages]]
messageBody = '''
[BALANCING]
[DETAILS]
details = [
"Streamlines Portable Tank Upgrade Recipes",
["Now takes Upgrade/Conversion Kits instead of Custom Materials",
"Portable Tanks could be Upgraded with Kits as Placed Blocks Previously"],
]
[DETAILS]
'''
[EXPAND]
2024-12-01 18:36:04 +11:00
Integer Limit
37bbdfe0a3
Update Nomi-Labs to v0.11.0 (#1126)
In this release:
- Bug Fix: ME Stocking Hatch/Bus Duplication
- Balancing: Increase Solid Fuel Efficiency 10x for Large Boilers
- Bug Fix: Edge Case Cleanroom Crash
- Bug Fix: Edge Case Effortless Building Crash
- Balancing: Increase Steel Cell Capacity to 16B (From 8B)
- Feature: Add Bronze Cell (Capacity: 8B)
- Feature: Allow GT Cells to Place/Collect Fluids

GroovyScript APIs Changed:
- QoL: Added a Simple IIngredient as a Template
- Feature: Added 'Strictable' Recipes

[EXPAND]
[[messages]]
messageBody = '''
[BUG]
[DETAILS]
details = [
"Fixes ME Stocking Hatch/Bus Duplication Glitch",
"Fixes Edge Case Cleanroom Crash",
"Fixes Edge Case Effortless Building Crash"
]
[DETAILS]
'''

[[messages]]
messageBody = '''
[BALANCING]
[DETAILS]
detail = "Increase Solid Fuel Efficiency 10x for Large Boilers"
[DETAILS]
'''

[[messages]]
messageBody = '''
[FEATURE]
[DETAILS]
details = [
"Add Bronze Cell (Capacity: 8B)",
"Increase Steel Cell Capacity to 16B (From 8B)",
"Allow GT Cells to Place/Collect Fluids",
]
[DETAILS]
'''
[EXPAND]
2024-11-30 21:11:37 +11:00
Integer Limit
e5f36974dd
Hide Higher Tier Muffler Hatches (#1065)
[FEATURE]
[DETAILS]
details = [
"Higher Tier Muffler Hatches have No Uses, Especially Since Ashes Cannot be Extracted via Automation",
"Existing Higher Tier Hatches Will Not Disappear, Recycling Recipes for Them Still Exist",
]
[DETAILS]
2024-10-15 08:12:50 +11:00
Integer Limit
96256f3005
Add Tooltips Saying P2P Type (#1066)
[FEATURE]
2024-10-14 21:52:50 +11:00
Integer Limit
5cfea1f4a3
Fix Airtight Seal Recipes (#1042)
[BUG]
[AUTHOR]
name = "Doniazade"
email = "86292752+Doniazade@users.noreply.github.com"
[AUTHOR]


Co-authored-by: Doniazade <86292752+Doniazade@users.noreply.github.com>
2024-10-08 19:12:46 +11:00
Integer Limit
dc7c2fdccd
Advanced Rocketry Tank Improvements (#1041)
[FEATURE]
[DETAILS]
details = [
"Fixes #276",
"Removed from JEI",
]
[DETAILS]
2024-10-08 13:01:23 +11:00
Integer Limit
716c957b4c
Fix Transmutating Airtight Seal Recipe (#1029)
[BUG]
[DETAILS]
detail = "Caused by Adding Other Mods"
[DETAILS]
2024-10-04 19:34:34 +10:00
Integer Limit
679a67cd6f
Update Nomi Labs to v0.9 (#1028)
[BUG]
[DETAILS]
details = [
"Fixes Disappearing Covers on Pipes (#987)",
"Fixes Cleanroom Loader Incompatibility (#993)",
"Makes Scrolling P2Ps Respect Direction",
"Fixes Drawer Keys on Empty Drawers",
]
[DETAILS]
2024-10-04 19:17:56 +10:00
Integer Limit
2ca3f3d0e0
Fix ME Conduit Recipe (#1025)
[BUG]
2024-10-04 12:04:09 +10:00
Integer Limit
4afba84af3
Fix NBT Problems in Pure Crystal Shortcut Recipes (#1014)
[BUG]

[DETAILS]
detail = "Fixes #1010"
[DETAILS]
2024-10-01 20:06:15 +10:00
Integer Limit
f283b96f61
Add Recycling Recipes for Inscriber Presses (#963)
[FEATURE]
2024-08-27 08:25:02 +10:00
Integer Limit
fcfae39ec2
Hide Better Questing Placeholders from JEI (#961)
[FEATURE]

[FIXUP]
sha = "b2491a2a2430edf03342ebedc673461ab981f9cf"
changeFixes = false
newBody = '''
[BUG]
[DETAILS]
detail = "Fixes #956"
[DETAILS]
[IGNORE]
checks = { compareBefore = "1.7-beta-6a" }
[IGNORE]
'''
[FIXUP]
2024-08-26 20:02:48 +10:00
Integer Limit
31090f7005
Hide BQu Loot Boxes from JEI (#960)
[FEATURE]
2024-08-26 19:53:59 +10:00
v3ect0rgames
aec24ceab0
Add Nomicoin-Free Airtight Seal Recipes (#946)
[FEATURE]



Co-authored-by: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
2024-08-25 21:27:05 +10:00
Integer Limit
07a793fb36
Misc AE2 Fixes and Improvements (#950)
[EXPAND]
[[messages]]
messageTitle = "Misc AE2 Improvements (#950)"
messageBody = '''
[DETAILS]
details = [
"Enables Color Applicator (with Tooltip)",
"Enables Entropy Manipulator",
"Enables Paint Balls",
"Enables Matter Cannon (with Tooltip)",
"Enables Quartz Wrenches",
]
[DETAILS]
'''

[[messages]]
messageTitle = "Fix Unintended Alt Recipe for Cable Anchors (#950)"
messageBody = "[BUG]"
[EXPAND]
2024-08-25 19:17:49 +10:00
Integer Limit
a340c11e83
Fix GroovyScript Error Caused by #927 (#934)
[SKIP]
2024-08-21 22:43:54 +10:00
Integer Limit
e28bd01ea2
Fix Restonia Crafting Core Recipe (#927)
[BUG]

[IGNORE]
checks = { compareBefore = "1.7-beta-6" }
[IGNORE]
2024-08-20 22:48:38 +10:00
Integer Limit
f8400587b2
Fix Sleeping in Void Dimension not Resetting Weather (#916)
[BUG]

[IGNORE]
checks = { compareBefore = "1.7-beta-6" }
[IGNORE]
2024-08-16 21:54:28 +10:00
Integer Limit
0d7b266a27
Fix Crystal Autoclave Recipe Conflicts & More (#910)
[EXPAND]
[[messages]]
messageTitle = "Fix Crystal Autoclave Recipe Conflicts (#910)"
messageBody = '''
[BUG]

[IGNORE]
checks = { compareBefore = "1.7-beta-5" }
[IGNORE]

[DETAILS]
detail = "Fixes #910"
[DETAILS]
'''

[[messages]]
messageTitle = "Add Autoclave Recipe from Fluix Dust to Fluix"
messageBody = "[FEATURE]"
[EXPAND]
2024-08-14 19:27:05 +10:00
Integer Limit
44d874ca35
Unhide Parabolic Flux Coupling (#909)
[BUG]

[IGNORE]
checks = { compareBefore = "1.7-beta-6" }
[IGNORE]
2024-08-14 18:50:17 +10:00
Integer Limit
aa9400470a
Fix #866 (#867)
[BUG]
2024-08-06 20:06:30 +10:00
Integer Limit
6206285453
Allow Tin in AE2 Processor GT Recipes (#860)
[BUG]

[IGNORE]
checks = { compareBefore = "1.7-beta-5" }
[IGNORE]
2024-08-04 21:04:23 +10:00
Integer Limit
8e06d6fb87
Hide Modded Buckets from JEI (#858)
[FEATURE]

[FIXUP]
sha = "bf4055fbe4092d72f68bb40bb5d88c624ce5b074"
changeFixes = false
newBody = '''
[EXPAND]
  [[messages]]
  messageTitle = "Upgrade AE2 Stuff to AE2 Stuff Unofficial"
  messageBody = """
    [BREAKING]

    [DETAILS]
      details = [
        \"Pattern Encoders have been Removed!\",
        \"Any existing Pattern Encoders, whether items, in patterns or placed, have been remapped to AE2 Interfaces.\",
        \"All Usages in Recipes have also been changed to AE2 Interfaces!\",
      ]
    [DETAILS]

    [PRIORITY]
      priority=25
    [PRIORITY]
  """
 
  [[messages]]
  messageTitle = "Update GT to 2.8.10"
  messageBody = """
    [BREAKING]

    [DETAILS]
      details = [
        \"Allows GregTech Data Sticks to Copy ME Hatch Settings\",
        \"Adds an 'Stocking' Version of ME Hatches and Buses\",
        \"Support for Displaying Power Substation on Central Monitor\",
      ]
    [DETAILS]

    [PRIORITY]
      priority=20
    [PRIORITY]

    [IGNORE]
      checks = { compareBefore = \"1.7-alpha-4\" } # Only apply this if the commit being compared against is 1.7-alpha-4 or newer
    [IGNORE]
  """
  
  [[messages]]
  messageTitle = "Update Nomi Labs to 0.7.0"
  messageBody = """
    [BREAKING]

    [DETAILS]
      details = [
        \"Improvement of the DME Simulation Chamber\",
        [\"Now increases Tiers and Data Counts of Models\", \"Now is Parallelizable\"],
        \"Improvement of the Universal Crystalizer\",
        [\"Now Accepts Laser Hatches\", \"Now is Parallelizable\"],
        \"Custom Implementation of Difficulty Lock, now works on Dedicated Servers\",
        \"Replacement of the Void Dimension, fixing issues with Difficulty Changing\",
        \"Replacement of Custom Window Titles and Logos, Allowing the Removal of Random Patches\",
        \"Improvements to FTB Utils and Effortless Building\",
        \"Allows Setting of Default Keybinds for New Players\",
      ]
    [DETAILS]

    [PRIORITY]
      priority=15
    [PRIORITY]
  """
[EXPAND]
'''
[FIXUP]
2024-08-04 20:49:42 +10:00
Integer Limit
7f22828d8f
Allow Empowered Void Crystal to Take Any Oil Type (#856)
[FEATURE]
2024-08-04 20:16:41 +10:00
Integer Limit
1bf37f6fab
Misc JEI Cleanup (#684)
[FEATURE]


Co-authored-by: v3ect0rgames <164247766+v3ect0rgames@users.noreply.github.com>
2024-08-02 22:35:19 +10:00
Integer Limit
688f572793
Update Nomi-Labs to v0.8.0 (#838)
[EXPAND]
[[messages]]
messageTitle = "P2P Conversion Enhancements (#838)"
messageBody = '''
[FEATURE]
[QOL]
[DETAILS]
details = [
"Allows Shift-Scrolling to Cycle Between P2Ps",
"Adds Conversion Assembler Recipes Between P2Ps",
]
[DETAILS]
'''

[[messages]]
messageTitle = "Fix NuclearCraft Liquid Helium Active Cooler Recipe (#838)"
messageBody = "[BUG]"
[EXPAND]
2024-08-01 08:17:48 +10:00
Integer Limit
c719b2e3cd
Revamp NuclearCraft Cooler Recipes (#839)
[BALANCING]
[DETAILS]
details = [
  "They Now Consume 30 EU/t, from 2 EU/t",
  "They Now Take Fluids, instead of Items",
]
[DETAILS]
2024-07-31 22:59:20 +10:00
Integer Limit
51fe4e5a29
Fix GrS Errors Introduced in #822 (#828)
[SKIP]
2024-07-27 19:32:24 +10:00
v3ect0rgames
c807632707
Hide Misc Thermal Expansion Arguments (#822)
Fixes #370

[FEATURE]
2024-07-21 12:29:17 +10:00
Integer Limit
5cb3a9d4c2
Fix Fluid Storage Component Recipes in HM (#812)
[BUG]
[HM]

[IGNORE]
  checks = { compareBefore = "1.7-beta-5" } # Only apply this if the commit being compared against is 1.7-beta-5 or newer
[IGNORE]
2024-07-19 12:08:36 +10:00
Shay
14c38dd16c
Fix AE2 Inscriber Recipes (#801)
[BUG]

[IGNORE]
  checks = { compareBefore = "1.7-beta-5" } # Only apply this if the commit being compared against is 1.7-beta-5 or newer
[IGNORE]

[FIXUP]
sha = "1018afd86f38fd706785607c5dbaeb828338c42b"
newBody = '''
[BUG]

[IGNORE]
  checks = { compareBefore = "1.7-beta-5" } # Only apply this if the commit being compared against is 1.7-beta-5 or newer
[IGNORE]
'''
[FIXUP]



Co-authored-by: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
2024-07-15 09:53:43 +10:00
Integer Limit
5d0ef356fa
Cleanup Thermal and EIO Items in JEI (#799)
[FEATURE]
2024-07-14 21:21:16 +10:00
Integer Limit
bf4055fbe4
Update Nomi-Labs, GT, GCYM, GrS and More (#790)
This PR updates Nomi-Labs to 0.7.0, allowing for associate updates to GT, GCYM, GrS and Architecture Craft, as well as the removal of Random Patches, Just Enough Dimensions, and Difficulty Lock.

Although GT 2.8.10 also fixed Extreme RAM Usage in Alfheim 1.3, (See PR https://github.com/GregTechCEu/GregTech/pull/2475) this PR **does not** update Alfheim to 1.3. This is because Alfheim 1.3, although not consuming large amounts of memory, still consumes more memory than 1.1.1, and causes fps spikes.

Also, because Nomi-Labs now implements a native and better difficulty lock, of which works on dedicated servers, `server.properties` overrides, as well as previously changed parts in README and Pack Mode Switchers (in https://github.com/Nomi-CEu/Nomi-CEu/pull/292), have been removed.

This PR also fixes an issue with corrupted images and jar files in built packs.

/* Github Stuff */

[FIXUP]
[[fixes]]
sha = "bd58b9072f45d647734ae66168cbd27bf9b2f220"
newTitle = "Update GT and Related Mods for 1.7"
newBody = '''
  [EXPAND]
  [[messages]]
    messageTitle = "Update GT to 2.8+, add Nomi Labs"
    messageBody = """
      [BREAKING]
      [DETAILS]
      details = [
        \"**Please DO NOT revert any saves that have been loaded in this release to 1.6.1b, 1.6.1a, or prior!**\",
        \"**Lots of Recipes have been moved to the Assembly Line, and now require Assembly Line Research.**\",
        \"Adds Assembly Line Research\",
        \"Adds ME Hatches and Buses, for combining Multiblocks with AE Networks\",
        \"Adds Filtered Output Hatches\",
        \"Adds EU Multiblock Power Storage\",
        \"Adds Multiblock Transformer and Laser Power Transfer\",
        \"Adds Long Distance Pipes\",
        \"Creating Waypoints in the Prospector\",
        \"Fixing many Bugs\",
        \"And many more!\"
      ]
      [DETAILS]
      [PRIORITY]
        priority = 100
      [PRIORITY]
    """

  [[messages]]
    messageTitle = "Multiblock Changes"
    messageBody = """
      [BREAKING]
      [DETAILS]
      details = [
        \"Multiblocks accept a new **maximum** of 2 Energy Hatches.\",
        \"All Custom Multiblocks, such as Naquadah Reactors and Multiverse Projectors, now have **minimum casing requirements** and a **maintenance hatch**.\",
        \"Some Custom Multiblocks now have Distinct Mode\",
        \"All Custom Multiblocks now have custom Front Overlays\",
        \"Reworked & Improved Multiblock UIs\"
      ]
      [DETAILS]
      [PRIORITY]
        priority = 50
      [PRIORITY]
    """
  [EXPAND]
  '''
[FIXUP]

[EXPAND]
  [[messages]]
  messageTitle = "Upgrade AE2 Stuff to AE2 Stuff Unofficial"
  messageBody = '''
    [BREAKING]
  
    [DETAILS]
      details = [
        "Pattern Encoders have been Removed!",
        "Any existing Pattern Encoders, whether items, in patterns or placed, have been remapped to AE2 Interfaces.",
        "All Usages in Recipes have also been changed to AE2 Interfaces!",
      ]
    [DETAILS]
    
    [PRIORITY]
      priority=25
    [PRIORITY]
  '''
  
  [[messages]]
  messageTitle = "Update GT to 2.8.10"
  messageBody = '''
    [BREAKING]
  
    [DETAILS]
      details = [
        "Allows GregTech Data Sticks to Copy ME Hatch Settings",
        "Adds an 'Stocking' Version of ME Hatches and Buses",
        "Support for Displaying Power Substation on Central Monitor",
      ]
    [DETAILS]
    
    [PRIORITY]
      priority=20
    [PRIORITY]
    
    [IGNORE]
      checks = { compareBefore = "1.7-alpha-4" } # Only apply this if the commit being compared against is 1.7-alpha-4 or newer
    [IGNORE]
  '''
  
  [[messages]]
  messageTitle = "Update Nomi Labs to 0.7.0"
  messageBody = '''
    [BREAKING]
    
    [DETAILS]
      details = [
        "Improvement of DME Simulation Chamber (now increases Tiers and Data Counts of Models)",
        "Custom Implementation of Difficulty Lock, now works on Dedicated Servers",
        "Replacement of the Void Dimension, fixing issues with Difficulty Changing",
        "Replacement of Custom Window Titles and Logos, Allowing the Removal of Random Patches",
        "Improvements to FTB Utils and Effortless Building",
        "Allows Setting of Default Keybinds for New Players",
      ]
    [DETAILS]
    
    [PRIORITY]
      priority=15
    [PRIORITY]
    
    [IGNORE]
      checks = { compareBefore = "1.7-alpha-4" } # Only apply this if the commit being compared against is 1.7-alpha-4 or newer
    [IGNORE]
  '''
[EXPAND]

[MOD INFO]
  [[infos]]
  projectID = 254317
  info = "Replaced by Nomi Labs"


  [[infos]]
  projectID = 285612
  info = "Replaced by Nomi Labs"
  
  [[infos]]
  projectID = 390886
  info = "Replaced by Nomi Labs"
  
  [[infos]]
  projectID = 538092
  info = "Replaced by Betterer P2P"
[MOD INFO]
2024-07-11 21:32:57 +10:00
tracer4b
497c5c2638
Add Lategame GT Recipes for AE2 Components (#772)
[BALANCING]
[DETAILS]
detail = "Implements #754"
[DETAILS]
2024-06-30 13:04:30 +10:00
Shay
c284b4a1aa
Mod Updates As Specified In #472 (#712)
[EXPAND]
[[messages]]
messageTitle = "Update AE2 Unofficial Extended Life (#712)"
messageBody = '''
[FEATURE]
[QOL]
'''

[[messages]]
messageTitle = "Update Neeve's AE2 Additions (#712)"
messageBody = '''
[FEATURE]

[DETAILS]
details = ["Adds Many QoL Features", "Adds Larger Cells and Crafting Storage"]
[DETAILS]
'''
[EXPAND]

Co-authored-by: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Co-authored-by: tracer4b <61507029+tracer4b@users.noreply.github.com>
2024-05-19 16:22:30 +10:00
SparkedTheorem
2f6ca989e7
Project Red Assembler Recipes (#707)
[FEATURE]
[QOL
2024-04-02 15:02:55 +11:00