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 |
|
gigabit101
|
1ed3d226f2
|
Closes #320
|
2016-01-16 04:27:17 +00:00 |
|
modmuss50
|
7139a62102
|
Update to fixed Reborn core and bump version
|
2016-01-13 13:40:02 +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
|
ad0b45cd2a
|
Add industrial sawmill recipes
|
2015-12-31 02:11:24 -08:00 |
|
mezz
|
5addee32e6
|
Add grinder recipes
|
2015-12-31 00:56:09 -08:00 |
|
modmuss50
|
2320ceb2c3
|
Fixed machines loosing state
|
2015-12-23 12:40:48 +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
|
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
|
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
|
3367e990be
|
Update to new forge and mappings
|
2015-11-29 09:52:45 +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
|
bce444a4ff
|
0
|
2015-11-23 20:34:05 +00:00 |
|
Modmuss50
|
fe9d41ac76
|
50
|
2015-11-23 20:27:06 +00:00 |
|
Modmuss50
|
839647ed85
|
734
|
2015-11-23 19:51:40 +00:00 |
|
Modmuss50
|
30879a534a
|
859
|
2015-11-23 19:19:18 +00:00 |
|
Modmuss50
|
b88fe49ee2
|
1936
|
2015-11-23 18:41:29 +00:00 |
|
Modmuss50
|
92ca6548c6
|
2211
|
2015-11-23 15:15:42 +00:00 |
|
Modmuss50
|
fa9cd98b5a
|
4693
|
2015-11-23 14:47:50 +00:00 |
|
Modmuss50
|
011ebaba1d
|
4862
|
2015-11-23 14:45:16 +00:00 |
|
Modmuss50
|
f0a70fa478
|
5235
|
2015-11-23 14:40:30 +00:00 |
|
modmuss50
|
d545521d04
|
Added PlayerDectector closes #286
|
2015-11-22 11:16:54 +00:00 |
|
modmuss50
|
05e7ecf2f3
|
Removed sout lines
|
2015-11-22 10:33:21 +00:00 |
|
Modmuss50
|
806cf757a5
|
Fixes #264
|
2015-11-18 19:41:37 +00:00 |
|
Modmuss50
|
3f41e26ece
|
Fixes some issues with the fustion reactor.
|
2015-11-18 17:02:22 +00:00 |
|
Modmuss50
|
758d918bdb
|
Got the Vacuum Freezer working.
|
2015-11-18 08:35:34 +00:00 |
|
Modmuss50
|
3114576e7b
|
Most of the Vacuum Freezer(Not working just yet)
|
2015-11-17 21:48:06 +00:00 |
|
Modmuss50
|
7db2e0dc8c
|
Polish to the reactor
|
2015-11-16 21:50:09 +00:00 |
|
Modmuss50
|
a63128aa7e
|
Added Fusion Reactor
|
2015-11-16 21:10:39 +00:00 |
|
Modmuss50
|
f42c127201
|
Added basic fustion reactor multiblock checking.
|
2015-11-16 15:20:19 +00:00 |
|
Modmuss50
|
100293fb8e
|
Started work on reactor.
|
2015-11-16 13:36:44 +00:00 |
|
Modmuss50
|
19d269b1de
|
Fixes #271
|
2015-11-16 11:17:36 +00:00 |
|
modmuss50
|
16f1a8de17
|
Charge bench recode.
|
2015-11-13 19:00:17 +00:00 |
|
gigabit101
|
cc2b6a8df3
|
All machines can now be powered with batteries
|
2015-11-13 16:40:01 +00:00 |
|
gigabit101
|
0ebf0c95dd
|
more charge slots
|
2015-11-13 16:29:35 +00:00 |
|
gigabit101
|
a74910e763
|
Some work on charge slots
|
2015-11-13 16:08:50 +00:00 |
|
Modmuss50
|
2331e3c35d
|
Fixes #255 and fixes #258
|
2015-11-12 21:38:11 +00:00 |
|
Modmuss50
|
61a600713a
|
Charge bench now supports higher teir items.
|
2015-11-12 21:28:49 +00:00 |
|
gigabit101
|
da631dd25e
|
Fixed Isidedness of Centrifuge closes #262
|
2015-11-12 21:01:36 +00:00 |
|
gigabit101
|
320d06e39e
|
Fixed Digital Chest not counting the ItemStack in output slot
|
2015-11-12 20:22:41 +00:00 |
|
gigabit101
|
d9654782fe
|
Fixed stack issue with Quantum/Digital Chest
|
2015-11-12 20:12:15 +00:00 |
|