Commit graph

936 commits

Author SHA1 Message Date
Blood-Asp
3e3a08af9a Fix AssemblyLine block check 2017-03-23 13:59:16 +01:00
Blood-Asp
de18b83e85 TryCatch broken IC2 recipes 2017-03-23 13:59:16 +01:00
Blood-Asp
1443cb6141 Alternative superbuffer recipe with datasticks 2017-03-23 13:59:16 +01:00
Blood-Asp
0ab1a57d58 Merge pull request #980 from MauveCloud/unstable
BoP Nether fix
2017-03-22 21:50:58 +01:00
MauveCloud
57ccbfc0c6 Allow dimensions added by other mods (besides GalactiCraft) to inherit GT worldgen features from overworld 2017-03-22 13:23:42 -07:00
MauveCloud
48461498f1 Fix for #726
Hopefully this will also fix #878.
2017-03-22 12:54:37 -07:00
MauveCloud
88f5b03973 Merge remote-tracking branch 'refs/remotes/Blood-Asp/unstable' into unstable 2017-03-22 12:52:22 -07:00
MauveCloud
561a977eb0 Merge remote-tracking branch 'refs/remotes/Blood-Asp/unstable' into unstable 2017-03-22 12:42:06 -07:00
Blood-Asp
6582650cf4 Fix spelling of wafers 2017-03-22 19:09:25 +01:00
Blood-Asp
d5a9a7c03e Fix missed casing recipe 2017-03-22 19:07:27 +01:00
Blood-Asp
e986232c34 Fix nether stones not generating in nether if enabled in config 2017-03-22 19:03:09 +01:00
Blood-Asp
6376f8a3de Fix 2 recipes 2017-03-22 18:58:39 +01:00
MauveCloud
a230f7b595 Merge remote-tracking branch 'refs/remotes/Blood-Asp/unstable' into unstable 2017-03-22 10:40:31 -07:00
MauveCloud
e8c819e75f Merge remote-tracking branch 'refs/remotes/Blood-Asp/unstable' into unstable 2017-03-22 10:23:13 -07:00
Blood-Asp
1a973d2733 PIC Wafer needs cleanroom too 2017-03-22 18:21:15 +01:00
Blood-Asp
b20b69b80f Merge pull request #975 from Dimach/unstable-2
Fixed ores not generated sometimes.
2017-03-22 18:03:30 +01:00
Blood-Asp
0ee176c936 Merge pull request #974 from Dimach/unstable-1
Fixed double chance of first 16 custom ores.
2017-03-22 18:01:54 +01:00
Blood-Asp
67f104925f Merge pull request #967 from Dimach/unstable
Fixed incorrect merge, rebase missing commit, resolve conflicts, cleanup code.
2017-03-22 18:01:27 +01:00
Dimach
58301dbe0e Fixed ores not generated sometimes. 2017-03-18 19:43:32 +02:00
Dimach
2cf6ab4c4d Fixed double chance of first 16 custom ores. 2017-03-18 19:18:38 +02:00
Dimach
5e7d95284c Cleanup code. 2017-03-16 16:24:39 +02:00
MauveCloud
b9d4d15a0c Fix for negative-coordinate vein generation, adjustments to recipes for stone dust, sand, and flint 2017-03-16 16:24:39 +02:00
Dimach
e6f6150781 Cleanup code and fix incorrect merge. 2017-03-16 16:24:39 +02:00
Blood-Asp
f4dae834da Merge pull request #952 from Techlone/soldering_alloy
Config for using only soldering alloy
2017-03-16 14:56:45 +01:00
Blood-Asp
286267e98d Merge pull request #963 from Dimach/unstable
Implement #292.
2017-03-16 14:56:01 +01:00
Blood-Asp
e7d0ced820 Merge pull request #965 from Techlone/nei_sort_recipes
Nei sort recipes
2017-03-16 14:55:12 +01:00
Techlone
288f44e347 Added a sorting of recipes in NEI 2017-03-16 00:24:41 +05:00
Dimach
76e82ed355 Implement #292. 2017-03-15 04:51:15 +02:00
Techlone
556fa42c37 fix adv circuit 2017-03-12 23:45:12 +05:00
Techlone
f05f216f30 Added new config value useOnlyGoodSolderingMaterials 2017-03-12 00:16:10 +05:00
John
7e83c04210 Merge pull request #10 from Blood-Asp/unstable
Update
2017-03-11 19:07:31 +05:00
Blood-Asp
d7203bccbd Recipe fixes 2017-03-10 00:57:06 +01:00
Blood-Asp
cbb96f9c8a Actually allow pollution go down to 0 2017-03-08 18:14:33 +01:00
Blood-Asp
48d7a1ee5d Fix rubber plates in modular armor boots 2017-03-08 17:52:28 +01:00
Blood-Asp
9c7e95b245 Fix low grav processing check 2017-03-08 17:28:05 +01:00
Blood-Asp
875821ede2 Rebalance gallium usage early game 2017-03-08 17:12:07 +01:00
Blood-Asp
af43ebade1 Better circuit tooltips 2017-03-08 16:57:16 +01:00
Blood-Asp
c314d8a21c Merge pull request #947 from Dimach/unstable
Resolve #917.
2017-03-08 12:57:15 +01:00
Dimach
d6c321883e Cleanness now decrease slow. 2017-03-08 02:28:41 +02:00
Dimach
9fa8238765 Resolve #917. 2017-03-08 01:22:45 +02:00
Blood-Asp
7d0acb394d Merge pull request #937 from maixgame/unstable
Fixed #935
2017-03-07 17:07:43 +01:00
Blood-Asp
84db19a19e Merge pull request #934 from Dimach/unstable
Fixed #930.
2017-03-07 17:06:39 +01:00
Maxime Legkiy
d60695addd Fix Pollution Neighbor BUG 2017-03-07 00:26:57 +03:00
Maxime Legkiy
c3101d6f04 Fixed #935 2017-03-06 22:26:16 +03:00
Maxime Legkiy
903661501e Fixed #935 2017-03-06 22:09:55 +03:00
Dimach
09c774689b Fixed #930. 2017-03-06 14:59:40 +02:00
Blood-Asp
7bae02b0ed Remove original IC2 adv circuit recipe. 2017-03-05 21:50:10 +01:00
Blood-Asp
7cb02737de Moar circuit balance 2017-03-05 00:22:54 +01:00
John
ad8496d0a2 Merge pull request #9 from Blood-Asp/unstable
Update
2017-03-04 22:51:20 +05:00
Blood-Asp
bb5f4705c0 Merge pull request #919 from Dimach/unstable-2
Fix basic machine bug (machine waste input when placed not in clearroom)
2017-03-02 22:32:11 +01:00