Commit graph

1705 commits

Author SHA1 Message Date
Blood-Asp
d725c463e5 null check to prevent bukkit crash 2017-03-31 16:14:36 +02:00
Blood-Asp
1cf68bbcdf Naquadah gen tiers 2017-03-26 21:38:39 +02:00
Blood-Asp
5771ee4e55 Merge pull request #987 from Sirse/unstable
Fix NEI NoClassDefFoundError
2017-03-26 21:17:01 +02:00
Blood-Asp
024a5adab1 Merge pull request #981 from dohyun22/patch-1
Fixed various Bugs on the Powderbarrel.
2017-03-26 21:16:22 +02:00
Blood-Asp
aea62155c0 Merge pull request #988 from Dimach/unstable
Fix #982, #986.
2017-03-26 21:14:55 +02:00
Dimach
324a4cc312 Cleanup code. 2017-03-26 21:00:17 +03:00
Dimach
3654c51469 Fix #982, #986. 2017-03-26 20:58:16 +03:00
Sirse
c3f9137218 Fix NEI NoClassDefFoundError
Ensure is NEI loaded before call their API methods
2017-03-27 00:02:13 +07:00
dohyun22
15db129b1d simplified the code. 2017-03-25 18:53:21 +09:00
dohyun22
945a13d4ae Fixed various Bugs on the Powderbarrel.
Fixed PrimedTNT Entity being spawned on client side when destroyed by player.
Fixed PrimedTNT Entity spawning at misplaced location (about 0.5m from the center of the block).
Fixed fuse sound not being played when ignited.
Fixed Powderbarrel not being able to spawn PrimedTNT Entity when destroyed by explosion.
2017-03-24 12:24:02 +09:00
Blood-Asp
445e548b4c Allow teleportation to galacticraft dimensions 2017-03-23 21:16:32 +01:00
Blood-Asp
5a7e797883 Reduce Plascrete Mininglevel and hardness/resistance 2017-03-23 20:34:54 +01:00
Blood-Asp
714f3c19fa Add powerconfigs to Teleporter 2017-03-23 13:59:16 +01:00
Blood-Asp
896ee56a08 Fix ItemDetector Cover not detecting slot 0 2017-03-23 13:59:16 +01:00
Blood-Asp
5f56c40a75 Prevent empty batterys from stacking in battery buffer 2017-03-23 13:59:16 +01:00
Blood-Asp
7c67f95c93 Small fusion reactor fixes 2017-03-23 13:59:16 +01:00
Blood-Asp
9c91a6cea2 Overclock high amp machines correctly in Processing Array 2017-03-23 13:59:16 +01:00
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
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
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