Commit graph

1261 commits

Author SHA1 Message Date
modmuss50
4585684fe2 Removed bucket textures as it now generates them at runtime 2016-02-02 21:22:51 +00:00
modmuss50
8ec95f9119 Now using new Forge Dynamic buckets, and prep for new update 2016-02-02 21:05:42 +00:00
mezz
e4af69e861 Update JEI & Forge, add recipe click areas and rolling machine transfer 2016-02-01 17:59:23 -08:00
modmuss50
c2562ac7b3 Update JSONDestroyer 2016-02-01 15:06:14 +00:00
modmuss50
3909a868aa Revert "Revert "Fix bucket issues""
This reverts commit d5b880387a.

# Conflicts:
#	src/main/java/techreborn/items/tools/ItemFluidbucket.java
2016-01-22 17:41:47 +00:00
modmuss50
f7ccd07b1a Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemFluidbucket.java
2016-01-22 13:40:47 +00:00
modmuss50
7e7ad74203 Squashed commit of the following:
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
2016-01-22 13:39:20 +00:00
modmuss50
d5b880387a Revert "Fix bucket issues"
This reverts commit 43768b9310.
2016-01-16 17:50:18 +00:00
modmuss50
43768b9310 Fix bucket issues 2016-01-16 15:54:41 +00:00
modmuss50
006b611fa3 Fix another merge error 2016-01-16 13:16:55 +00:00
modmuss50
415531587b Fix incorrect merge 2016-01-16 13:11:08 +00:00
modmuss50
2a617919d9 Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
# Conflicts:
#	src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
#	src/main/java/techreborn/tiles/TileBlastFurnace.java
2016-01-16 13:09:09 +00:00
modmuss50
b7023f3114 Merge remote-tracking branch 'remotes/origin/master' into 1.7.10 2016-01-16 13:06:43 +00:00
gigabit101
77bfbc46f8 closes #311 2016-01-16 04:32:58 +00:00
gigabit101
1ed3d226f2 Closes #320 2016-01-16 04:27:17 +00:00
modmuss50
692c89a6a0 Fixes #327 2016-01-13 17:17:53 +00:00
modmuss50
eca3534d1e fixes #324 2016-01-13 15:41:30 +00:00
modmuss50
7139a62102 Update to fixed Reborn core and bump version 2016-01-13 13:40:02 +00:00
modmuss50
2b54516bdd Fixes #321 - And I tested it so I know it works 2016-01-09 11:41:16 +00:00
modmuss50
be2f5f9e52 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-01-07 10:46:33 +00:00
modmuss50
b588e8c08a IC2 Classic API support (This is all you are getting)
If this is broken I dont care, if it has broken other things I will care.
2016-01-07 10:46:13 +00:00
mezz
a00543c67d Update to latest JEI 2016-01-06 00:46:23 -08:00
modmuss50
ee86b97429 Fixed issue with RF not working as expected 2016-01-05 18:12:13 +00:00
modmuss50
7ecdd27752 Start work on porting from the MT script 2016-01-03 19:07:31 +00:00
modmuss50
b242ec5c5f Cut all the things! 2016-01-02 01:40:11 +00:00
modmuss50
7e12e3acbf Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-01-01 20:36:12 +00:00
modmuss50
cf800a905b Fixes #309 and might help #314 2016-01-01 20:35:58 +00:00
mezz
686dd71caf Add rolling machine recipes 2015-12-31 03:20:04 -08:00
mezz
090de63608 Add Vacuum Freezer recipes 2015-12-31 02:27:07 -08:00
mezz
ad0b45cd2a Add industrial sawmill recipes 2015-12-31 02:11:24 -08:00
mezz
123042a069 Refactor setting recipe items for JEI 2015-12-31 02:10:57 -08:00
mezz
3fde850448 Add Industrial Electrolyzer recipes 2015-12-31 01:40:56 -08:00
mezz
ef1ee67c06 Change blast furnace recipe in JEI to crop out the power icon 2015-12-31 01:26:26 -08:00
mezz
6ce72c8339 Fix oreDict support for recipes in JEI 2015-12-31 01:25:54 -08:00
mezz
aed7b5c0c4 Add implosion compressor recipes 2015-12-31 01:07:35 -08:00
mezz
5addee32e6 Add grinder recipes 2015-12-31 00:56:09 -08:00
mezz
c187f931ce Add chemical reactor recipes 2015-12-30 23:30:09 -08:00
mezz
bb82e2cfb2 Add centrifuge recipes 2015-12-30 23:13:02 -08:00
mezz
ff571d5444 Add blast furnace recipes 2015-12-30 22:28:58 -08:00
mezz
05d8a5c787 Add assembling machine recipes 2015-12-30 22:28:39 -08:00
mezz
4b804c3521 Add alloy furnace recipes 2015-12-30 21:17:20 -08:00
mezz
202555b4ac Add RecipeTransferHandler for FusionReactor 2015-12-30 20:20:36 -08:00
mezz
181498e132 Clean up JEI Integration 2015-12-30 20:09:06 -08:00
modmuss50
1c28fa6e0a Revert "Disable BOP support to try and fix gradle crash"
This reverts commit 13f3d5757f.
2015-12-30 23:57:06 +00:00
modmuss50
c791bcdeb5 update to new RebornCore 2015-12-30 23:25:36 +00:00
modmuss50
13f3d5757f Disable BOP support to try and fix gradle crash 2015-12-30 17:17:16 +00:00
modmuss50
54817286e6 Revert "test to fix build issue"
This reverts commit eed1a7a719.
2015-12-30 17:09:17 +00:00
modmuss50
0c7f07001b temp remove jei support to track down build issue. 2015-12-30 17:06:24 +00:00
modmuss50
895d5cfdd9 1.8.9 update 2015-12-30 11:57:06 +00:00
modmuss50
d973d6b108 Added back some more compat 2015-12-28 10:57:22 +00:00
modmuss50
df213bc22a Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8 2015-12-23 12:43:53 +00:00
modmuss50
2320ceb2c3 Fixed machines loosing state 2015-12-23 12:40:48 +00:00
Modmuss50
13d3d475fd Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-18 19:39:43 +00:00
modmuss50
5821dbfe0e Added config to CompatManager to allow disabling of handlers. 2015-12-18 19:17:11 +00:00
Modmuss50
f17cd36815 Update merged commits to 1.8.8 2015-12-16 17:13:17 +00:00
Modmuss50
0fdba82490 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
#	src/main/java/techreborn/compat/CompatManager.java
2015-12-16 17:10:25 +00:00
Modmuss50
741c25a5a2 Standalone recipes! 2015-12-16 17:04:37 +00:00
Modmuss50
0c80f2beda More recipes, work on #182 2015-12-16 16:40:47 +00:00
Modmuss50
eedabb9e7d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiGrinder.java
#	src/main/java/techreborn/tiles/TileGrinder.java
2015-12-16 16:06:33 +00:00
Modmuss50
96a7b56b5f Fixes #304 2015-12-16 15:56:12 +00:00
Modmuss50
5324016199 fixes #302 2015-12-16 11:07:34 +00:00
Modmuss50
fbc5291a1d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-14 18:14:12 +00:00
Modmuss50
23255bdfff Fixes #301 2015-12-14 18:13:47 +00:00
Modmuss50
7c48afa63c Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-14 17:47:28 +00:00
Modmuss50
6df6dbfdf5 Fixes #300 2015-12-14 17:45:06 +00:00
Modmuss50
08c0e2d81e Fixes #299 2015-12-14 11:06:25 +00:00
Modmuss50
efd19336bf Revert "Load TechReborn before RebornCore might help with #299"
This reverts commit a1194698cb.
2015-12-14 08:31:39 +00:00
Modmuss50
a1194698cb Load TechReborn before RebornCore might help with #299 2015-12-14 08:24:13 +00:00
Modmuss50
abcaccdc82 Added waila support back 2015-12-13 19:41:46 +00:00
modmuss50
3b3deea57b update things 2015-12-13 13:29:15 +00:00
Modmuss50
d64928b4e4 Added more null checks, might fix #297 2015-12-12 11:48:34 +00:00
Modmuss50
d5ce5cba04 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
#	src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
2015-12-12 11:41:21 +00:00
Modmuss50
cc6dfbc3c4 Fixes #295 2015-12-11 21:52:35 +00:00
Modmuss50
5c95b238fa Fixes #296 2015-12-11 21:33:32 +00:00
Modmuss50
31f1786f6d Updated JEI 2015-12-11 20:07:38 +00:00
Modmuss50
9bb3aad137 Update to new RebornCore 2015-12-11 19:48:16 +00:00
modmuss50
801964a92d Bumped required forge version 2015-12-06 15:02:05 +00:00
modmuss50
f7477f5496 Removed fluid sources from creative tab. 2015-12-06 10:35:37 +00:00
modmuss50
ba90e49822 updated JEI, and improved support 2015-12-05 22:48:11 +00:00
modmuss50
40f78c3938 Merge branch 'master' into 1.8.8
Conflicts:
	build.gradle
2015-12-05 20:30:20 +00:00
modmuss50
cf36bc9dc1 Fixes #293 and removed java doc 2015-12-05 20:23:40 +00:00
modmuss50
a795f90971 Update forge, fix ticking tiles. 2015-12-05 20:14:32 +00:00
modmuss50
20af49394f Fluid rendering, no more wasted block states 2015-12-05 19:37:42 +00:00
modmuss50
3fb7dd102b Inital Just Enough Items support 2015-11-29 10:42:34 +00:00
modmuss50
3367e990be Update to new forge and mappings 2015-11-29 09:52:45 +00:00
modmuss50
d5e2628f7a Some small tweaks 2015-11-28 12:51:49 +00:00
modmuss50
6679c595c5 Some attempts at getting fluid to render. 2015-11-27 20:41:02 +00:00
modmuss50
0d4b9afd01 All Items now have textures 2015-11-27 20:17:12 +00:00
modmuss50
94a2229ed7 All block textures now work 2015-11-27 19:54:34 +00:00
modmuss50
1475554f8e Bundle the ic2 wrench api 2015-11-27 19:21:52 +00:00
Modmuss50
52af3d2d2d Removed null recipes 2015-11-27 13:15:19 +00:00
Modmuss50
285176e171 Large handfull of textures. 2015-11-26 21:48:30 +00:00
Modmuss50
7370784c7f More textures 2015-11-26 20:43:56 +00:00
Modmuss50
869e6d4bf8 Fixed compile errors 2015-11-26 19:33:52 +00:00
Modmuss50
b0784c44d2 Fixes for latest forge and more rendering. 2015-11-26 17:35:31 +00:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
f12725b4e0 Fixed charge hud, and clocking device. 2015-11-25 08:28:28 +00:00
Modmuss50
d56e6752c0 A lot of stuff looks better now 2015-11-24 22:58:18 +00:00
Modmuss50
0bb1375823 Added cell rendering 2015-11-24 21:39:22 +00:00
Modmuss50
90628fad02 It runs 2015-11-23 20:37:20 +00:00