Commit graph

178 commits

Author SHA1 Message Date
Dmitry
c0a53cab62
Merge pull request #732 from AirRice/sign-exploit-squasher
Hanging Sign Metal Dupe fix
2025-01-26 00:01:51 +07:00
Dmitry
d8fa521bc9
Merge pull request #739 from Nebby1999/main
Feature:  Papermaking Overhaul with Wood
2025-01-26 00:00:21 +07:00
Dmitry
1ecdc4bd76
Merge pull request #744 from Pyritie/patch-2
Changed LV casing/hull recipes (again)
2025-01-25 23:55:45 +07:00
Dmitry
81b06d7caa
Merge pull request #751 from Pyritie/Fixed-colored-steel-dust-centrifuge-recipes
Fixed colored steel dust centrifuge recipes
2025-01-25 23:53:07 +07:00
Nebby1999
52f44279c9 Remove log call 2025-01-24 20:43:26 -03:00
Nebby1999
afdba67fd4 Get small dust from failed pressing 2025-01-24 20:36:50 -03:00
Pyritie
030bc552d4
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-23 21:46:48 +00:00
Pyritie
387c72d380
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-22 20:38:42 +00:00
Nebby_G
382fa8c4c5 Finished Implementation, added to Field Guide 2025-01-20 14:29:42 -03:00
Nebby_G
f56ec8a90b Merge tag '0.7.18' 2025-01-19 21:30:24 -03:00
Nebby_G
9f9a9f229a More Hardwood work 2025-01-19 21:30:03 -03:00
AirRice
f0a4f4f57b fix hanging sign metal exploit 2025-01-19 08:34:23 +00:00
Pyritie
20050fa3eb
Merge branch 'main' into patch-5 2025-01-18 12:18:38 +00:00
Pyritie
28b86c9ff3
Merge branch 'main' into patch-5 2025-01-18 11:11:31 +00:00
Pyritie
f53dfcb847
Merge branch 'main' into create-additions 2025-01-18 10:37:20 +00:00
Curtis Merrill
34c46c3b0d create some rich coal recipes in coke oven and pyro oven 2025-01-18 03:59:24 -05:00
Dmitry
c28b64a9c8
Merge branch 'main' into create-additions 2025-01-18 13:21:30 +07:00
Pyritie
324ac1adda
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 22:10:34 +00:00
Pyritie
5035130495
Merge branch 'main' into mv_superwire
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-17 17:52:01 +00:00
Dmitry
2f43a94b27
Merge pull request #721 from KorGgenT/flux
create fluxstone recipes in macerator and forge hammer
2025-01-18 00:34:51 +07:00
Dmitry
ed1becf35d
Merge branch 'main' into colored_glass_macerate
Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com>
2025-01-18 00:32:00 +07:00
Pyritie
793cc7676c
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-16 00:23:48 +00:00
Curtis Merrill
2b5d388c09 create fluxstone recipes in macerator and forge hammer 2025-01-15 15:51:51 -05:00
Pyritie
ffaa650288
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-15 11:50:37 +00:00
CaptainGold1
edfe28034b Allows all colors of glass to be macerated/hammered to dust 2025-01-13 16:57:49 -06:00
Pyritie
8eaa363f38
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-13 14:31:40 +00:00
Pyritie
dc0ed9001d
Merge branch 'main' into create-additions
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 14:25:41 +00:00
Pyritie
6ac60ec841
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 13:28:54 +00:00
Pyritie
f6e31716e4
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 08:54:49 +00:00
Pyritie
b94ae44b04
Merge branch 'main' into patch-5
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 08:52:01 +00:00
Dmitry
59f66ff307
Merge pull request #686 from Pyritie/gas-multiblocks
Gas multiblocks
2025-01-12 11:53:48 +07:00
Dmitry
9d6e8fdf73
Merge pull request #696 from Pyritie/patch-3
Fixed mixer recipes for red/blue steel
2025-01-12 11:52:59 +07:00
Pyritie
6e477e1469
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-12 00:49:34 +00:00
Pyritie
78ff3af136
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:56:51 +00:00
Pyritie
98b9452ade
Update tags.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 19:40:29 +00:00
Pyritie
243aa97968
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 16:32:34 +00:00
Pyritie
758f26b63b
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 12:41:55 +00:00
Pyritie
983ce50199
Merge branch 'main' into gas-multiblocks
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-11 11:45:40 +00:00
Dmitry
06c4477cc6
Merge pull request #681 from fluffle/0.7.15-mainframe
Use 2x annealed copper wires in ZPM mainframe recipe.
2025-01-11 14:21:41 +07:00
Pyritie
04407db649
update gregtech/recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-10 23:23:02 +00:00
Alex Bramley
d6084eaff6 Use 2x annealed copper wires in ZPM mainframe recipe. 2025-01-09 23:06:26 +00:00
Alex Bramley
296b9abd9e Fix maintenance hatch recycling recipes too. 2025-01-09 09:28:47 +00:00
Pyritie
0332cf4620
Merge branch 'TerraFirmaGreg-Team:main' into patch-5 2025-01-06 17:44:43 +00:00
Dmitry
723b08001e Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern 2025-01-06 22:32:49 +07:00
Dmitry
867c17d3aa unfuck fucking javascript 2025-01-06 22:32:44 +07:00
Pyritie
9af4b02b21
Merge branch 'TerraFirmaGreg-Team:main' into patch-6 2025-01-06 15:12:56 +00:00
Pyritie
11e8626e91
Merge branch 'main' into patch-5
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 15:11:55 +00:00
Pyritie
ea7f6d43cd
Added recipes to stop duping of redalloy + steam machines
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-01-06 14:55:23 +00:00
Alex Bramley
d6939485ab Add circuit to assembler redstone lamp recipe. 2025-01-06 14:26:24 +00:00
Alex Bramley
772e8f313e Super tank/chest self-crafting recipes to strip NBT. 2025-01-06 14:26:13 +00:00