Modmuss50
|
e154c15fd9
|
Prep for update for new reborn core
|
2016-01-24 11:37:19 +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
|
5304e38502
|
Update README.md
|
2016-01-16 13:27:11 +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
|
a9a85bcd84
|
Now use none dev version of RebornCore
|
2016-01-13 11:13:38 +00:00 |
|
modmuss50
|
fbe51d98cd
|
update forge
|
2016-01-13 11:07:47 +00:00 |
|
Modmuss50
|
c000c47f7c
|
update: Please see http://techreborn.ninja/?p=20
|
2016-01-12 19:15:22 +00:00 |
|
modmuss50
|
227217285a
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-01-09 11:41:29 +00:00 |
|
modmuss50
|
2b54516bdd
|
Fixes #321 - And I tested it so I know it works
|
2016-01-09 11:41:16 +00:00 |
|
Modmuss50
|
6c3e0e47c3
|
Update build.gradle
|
2016-01-07 11:03:49 +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
|
e03bbacfcf
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-01-05 18:12:24 +00:00 |
|
modmuss50
|
ee86b97429
|
Fixed issue with RF not working as expected
|
2016-01-05 18:12:13 +00:00 |
|
modmuss50
|
11ab05da00
|
Remove FastBuild
|
2016-01-04 23:07:54 +00:00 |
|
modmuss50
|
7ecdd27752
|
Start work on porting from the MT script
|
2016-01-03 19:07:31 +00:00 |
|
modmuss50
|
93f039c71b
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2016-01-02 01:40:21 +00:00 |
|
modmuss50
|
b242ec5c5f
|
Cut all the things!
|
2016-01-02 01:40:11 +00:00 |
|
Modmuss50
|
01dfab2031
|
Update build.gradle
|
2016-01-01 21:33:13 +00:00 |
|
mezz
|
d1b4fe3027
|
update JEI version
|
2016-01-01 13:18:42 -08: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 |
|
