Commit graph

2109 commits

Author SHA1 Message Date
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
Dream-Master
97c2c691dd Field generator #1225
https://github.com/GTNewHorizons/NewHorizons/issues/1225
Code cleanup
2017-03-21 22:26:01 +01:00
Dream-Master
2c48e71096 UV machine casing #1242 https://github.com/GTNewHorizons/NewHorizons/issues/1242 2017-03-21 21:39:43 +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
Technus
b80b3923b7 Revert "Import assets"
This reverts commit 6234dccbcc.
2017-03-18 17:27:57 +01:00
Technus
6234dccbcc Import assets 2017-03-18 17:20:58 +01:00
Dream-Master
40f10c2cab bump version 2017-03-18 16:00:59 +01:00
Technus
31546ade97 Add creative tab with tools 2017-03-18 13:53:33 +01:00
Technus
5fac76aa71 Add pre build tools to NEI 2017-03-18 12:48:42 +01:00
John
88128f3114 Merge pull request #13 from Dimach/unstable
Update
2017-03-17 01:23:21 +05:00
John
2a80f9d4a6 Merge pull request #12 from Blood-Asp/unstable
Update
2017-03-17 01:19:18 +05: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
Dream-Master
0b32f44a6f maybe this works 2017-03-15 19:48:33 +01:00
Dream-Master
515234aac0 Add yamcore to gradle 2017-03-15 19:36:50 +01:00
Technus
74f8aa0533 Optimize imports 2017-03-15 18:02:53 +01:00
Technus
51cc55d916 Make the logger less spammy 2017-03-15 18:01:25 +01:00
Technus
eee7f5f4bc adding event counter 2017-03-15 17:20:07 +01:00
Technus
d115aa7ebf Expand D1 Level Logging of ore generators. 2017-03-15 17:16:00 +01:00
Dimach
76e82ed355 Implement #292. 2017-03-15 04:51:15 +02:00
Dream-Master
bed07999bd Basic Item Filter recipe change #1203 https://github.com/GTNewHorizons/NewHorizons/issues/1203 2017-03-13 21:32:41 +01: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
Dream-Master
4c8cad9230 Add new Plastic recipe https://github.com/GTNewHorizons/NewHorizons/issues/1137 2017-03-10 20:17:02 +01:00
Dream-Master
772d3c0ce1 Add Amethyst Dust to Implosion compressor. 2017-03-10 19:28:19 +01:00
Dream-Master
36eea25d7d Change Lubricant recipes a bit 2017-03-10 18:46:44 +01:00
Blood-Asp
d7203bccbd Recipe fixes 2017-03-10 00:57:06 +01:00
Dream-Master
f83525ecd5 bump version 2017-03-08 21:28:15 +01:00
Dream-Master
43c114d436 Nikolite be the New Electrotine. PR Mod compatible. 2017-03-08 21:27:34 +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