modmuss50
|
ef03cf50a9
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
src/main/java/techreborn/asm/LoadingPlugin.java
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
src/main/java/techreborn/client/render/MultiblockRenderEvent.java
src/main/java/techreborn/compat/recipes/RecipesIC2.java
src/main/java/techreborn/init/ModItems.java
src/main/java/techreborn/lib/Location.java
src/main/java/techreborn/packets/PacketPipeline.java
src/main/java/techreborn/partSystem/fmp/CableConverter.java
|
2015-11-08 12:34:18 +00:00 |
|
modmuss50
|
8abf6e5282
|
Moved to RebornCore
|
2015-11-08 12:15:45 +00:00 |
|
Modmuss50
|
678a44937f
|
Should fix #211
|
2015-11-07 08:58:26 +00:00 |
|
MrBretzel
|
b8487f5eb5
|
Fix #196 and mini clean up
|
2015-10-25 07:34:37 +01:00 |
|
Modmuss50
|
7ae4ec1a98
|
Clean up of ic2 classic recipes
|
2015-10-14 13:39:05 +01:00 |
|
Modmuss50
|
cae4aad955
|
fixes #189
|
2015-10-14 13:27:43 +01:00 |
|
gigabit101
|
935a8bc382
|
Removed more junk
|
2015-10-09 22:11:04 +01:00 |
|
gigabit101
|
a8ea0f55e7
|
Removed a load of un needed junk from other versions of Gtech
|
2015-10-09 21:55:54 +01:00 |
|
Modmuss50
|
d490d00ab0
|
Removed forestry version checker, will try fix again later
|
2015-10-06 21:51:09 +01:00 |
|
Modmuss50
|
599ab5d634
|
Clean up forestry version checker
|
2015-10-06 20:47:50 +01:00 |
|
Modmuss50
|
4683f1450f
|
Disables forestry intergtation when not using version 4 or higher
|
2015-10-06 20:46:03 +01:00 |
|
modmuss50
|
a390a37cb1
|
Fixes forestry saw mill recipes
|
2015-10-03 12:39:18 +01:00 |
|
modmuss50
|
3708a49bb9
|
Initial update to forestry 4(Sawmill recipes are not working)
|
2015-10-03 10:21:13 +01:00 |
|
modmuss50
|
146deb0e8b
|
Added recipes to IC2 classic, fixed recipes when using ic2, fixes #158
|
2015-10-02 21:01:30 +01:00 |
|
Modmuss50
|
3f4b59faaf
|
Fixes #130
|
2015-09-23 17:27:41 +01:00 |
|
modmuss50
|
ccaabdd230
|
Started work on adding the recipes back to ic2 classic
|
2015-09-20 13:55:54 +01:00 |
|
Modmuss50
|
bd1540b27b
|
Fixed fluid power value importing
|
2015-09-14 21:34:56 +01:00 |
|
modmuss50
|
8aafd118f5
|
Added fluid power manager, imports from forestry and bc
|
2015-09-08 18:39:59 +01:00 |
|
modmuss50
|
72799a9474
|
Added some fuels to forestry's api, might write our own and import bc's and forest into ours.
|
2015-09-08 13:26:24 +01:00 |
|
modmuss50
|
15b9671dc4
|
fixes #120
|
2015-08-27 13:09:31 +01:00 |
|
gigabit101
|
25aeaf371e
|
added recipe for PDA
|
2015-08-16 21:19:27 +01:00 |
|
gigabit101
|
73f28281e3
|
A few more recipe tweeks and configs
|
2015-08-16 20:41:23 +01:00 |
|
modmuss50
|
ccb028a202
|
Tweaked thermal generator, closes #100
|
2015-08-16 12:17:02 +01:00 |
|
gigabit101
|
d17276e96d
|
Added config's to disable mod integration closes #111
|
2015-08-15 23:31:02 +01:00 |
|
modmuss50
|
e0ab0af822
|
Reformatted all the code using the default intelji formatting options.
|
2015-08-09 11:05:32 +01:00 |
|
modmuss50
|
9e346e6061
|
Added machine parts, added some recipes. Fixes #92
|
2015-08-05 15:35:06 +01:00 |
|
modmuss50
|
8725c5932d
|
It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items.
|
2015-07-23 16:19:07 +01:00 |
|
modmuss50
|
4ae1293535
|
Optimised all imports
|
2015-07-02 19:51:24 +01:00 |
|
modmuss50
|
664252bc96
|
fixes #64
|
2015-06-29 19:18:26 +01:00 |
|
Gig
|
6353b9dc06
|
Fixed some small recipe Issues
|
2015-06-27 01:29:20 +01:00 |
|
joflashstudios
|
b48dd6582a
|
Moved non-IC2 compat recipes out of IC2 compat class.
All that is in RecipesIC2 now are modifications to IC2 recipes, or additional recipes in IC2 machines.
|
2015-06-25 22:56:02 -04:00 |
|
joflashstudios
|
338575d56d
|
Added iron IBF recipes
|
2015-06-25 22:36:06 -04:00 |
|
joflashstudios
|
11d4345ee7
|
Renamed to ItemDustTiny for consistancy
Renamed to ItemDustsTiny
|
2015-06-25 20:04:08 -04:00 |
|
joflashstudios
|
a7209f7e79
|
Added elecrolyzer NEI handler
|
2015-06-22 00:40:05 -04:00 |
|
joflashstudios
|
dc49bb9b45
|
Changed accessability, added placeholder electrolyzer recipe function
|
2015-06-21 20:00:25 -04:00 |
|
joflashstudios
|
2b17e7e949
|
Missed some AOBD lines
|
2015-06-14 18:03:32 -04:00 |
|
joflashstudios
|
9359022c83
|
Added fix for AOBD compatibility
|
2015-06-14 17:56:15 -04:00 |
|
Tntrololol
|
1e657c9e04
|
Added Industrial Sawmill Recipes for Forestry logs
|
2015-06-13 18:31:46 -05:00 |
|
Tntrololol
|
a9ea898cab
|
Added Industrial Sawmill Recipes for Thaumcraft magical logs
|
2015-06-13 15:59:55 -05:00 |
|
Tntrololol
|
e3338cf40f
|
Fixed existing Sawmill recipes not outputing empty cells
|
2015-06-13 14:56:15 -05:00 |
|
modmuss50
|
7308507a74
|
fixes #31 , Fixes crash without bop or natura installed, fixes npe with no plup item, adds basic fluid gui support to the nei handler, fixes build craft 6 not working
|
2015-06-13 07:45:12 +01:00 |
|
modmuss50
|
6deb0b1d32
|
Improved the way we handle other mods
|
2015-06-12 18:40:08 +01:00 |
|
Tntrololol
|
776fd328c3
|
Added Chemical Reactor Recipes
|
2015-06-08 22:13:14 -05:00 |
|
Tntrololol
|
0bd2b68d83
|
Added Implosion Compressor Recipes
|
2015-06-08 21:01:43 -05:00 |
|
modmuss50
|
b56487b680
|
This should fix bc 6 compatibility
Can some one test please.
|
2015-06-08 18:26:22 +01:00 |
|
modmuss50
|
2ef2ff997f
|
updated to build craft 7.0.8
|
2015-06-08 17:41:41 +01:00 |
|
joflashstudios
|
02fce02d7b
|
Said goodbye to RecipeHanderer
A bunch of ModRecipes fixes
|
2015-06-08 10:45:21 -04:00 |
|
joflashstudios
|
ffc4d5f9c3
|
Cleaned up some imports
|
2015-06-08 10:14:50 -04:00 |
|
joflashstudios
|
e2d0bd4a82
|
Removed the config object
It's not getting used. Those configs are static members.
|
2015-06-08 02:56:20 -04:00 |
|
joflashstudios
|
a2c0e4d091
|
Fixed some indentation I missed
|
2015-06-08 02:54:17 -04:00 |
|