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
|
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
|
b242ec5c5f
|
Cut all the things!
|
2016-01-02 01:40:11 +00:00 |
|
modmuss50
|
cf800a905b
|
Fixes #309 and might help #314
|
2016-01-01 20:35:58 +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
|
0c80f2beda
|
More recipes, work on #182
|
2015-12-16 16:40: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
|
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
|
52af3d2d2d
|
Removed null recipes
|
2015-11-27 13:15:19 +00:00 |
|
Modmuss50
|
b0784c44d2
|
Fixes for latest forge and more rendering.
|
2015-11-26 17:35:31 +00:00 |
|
Modmuss50
|
30879a534a
|
859
|
2015-11-23 19:19:18 +00:00 |
|
Modmuss50
|
92ca6548c6
|
2211
|
2015-11-23 15:15:42 +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
|
2c31b9211c
|
Started work on the player detector.
|
2015-11-18 20:59:08 +00:00 |
|
Modmuss50
|
3114576e7b
|
Most of the Vacuum Freezer(Not working just yet)
|
2015-11-17 21:48:06 +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
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +00:00 |
|
Modmuss50
|
08b570ea36
|
Fixes #244
|
2015-11-11 17:08:41 +00:00 |
|
Modmuss50
|
842fa421ae
|
Fixes #243
|
2015-11-11 17:00:18 +00:00 |
|
Modmuss50
|
2dd4e93f41
|
Cleaned up ore recipes, closes #241
|
2015-11-11 16:46:50 +00:00 |
|
Modmuss50
|
f4a3e87ebb
|
Fixes #233
|
2015-11-11 15:54:19 +00:00 |
|
Modmuss50
|
faa1d079cd
|
Added a handfull of recipes for #182
|
2015-11-11 11:21:10 +00:00 |
|
Modmuss50
|
3799eb3eb2
|
Work for #182
|
2015-11-11 08:33:05 +00:00 |
|
modmuss50
|
d4222693c0
|
Cleaned up Item Power System
|
2015-11-08 13:59:36 +00:00 |
|
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
|
a8c9b71e47
|
Some work on the ore Unifier, for #225
|
2015-11-07 09:12:44 +00:00 |
|
modmuss50
|
bffbd31cab
|
Sort of Revert "why was this done twice"
This reverts commit 363adeb681 .
Fixes #209
|
2015-11-01 16:24:35 +00:00 |
|
Modmuss50
|
cd32fe255c
|
Added ore dic for gems back, fixes #188
|
2015-10-12 07:54:28 +01:00 |
|
modmuss50
|
a34a005b7b
|
Fixes #183
|
2015-10-10 16:45:12 +01:00 |
|
gigabit101
|
891a5f5d19
|
closes 179
|
2015-10-09 22:19:38 +01:00 |
|
gigabit101
|
e1db33dd8a
|
Missed one
|
2015-10-09 22:13:08 +01:00 |
|
gigabit101
|
935a8bc382
|
Removed more junk
|
2015-10-09 22:11:04 +01:00 |
|
gigabit101
|
363adeb681
|
why was this done twice
|
2015-10-09 22:06:35 +01:00 |
|
gigabit101
|
0f089c79e6
|
removed un needed ore dict stuff
|
2015-10-09 22:04:54 +01:00 |
|
gigabit101
|
fd4ecbb6d2
|
closes #184
|
2015-10-09 21:59:20 +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
|
9c3bc97af2
|
Fixes #162, sorry if it breaks some of your tiles.
|
2015-10-06 20:39:19 +01:00 |
|
Modmuss50
|
081f16a533
|
Removed Farm
|
2015-09-23 18:58:46 +01:00 |
|
Modmuss50
|
3f4b59faaf
|
Fixes #130
|
2015-09-23 17:27:41 +01:00 |
|
modmuss50
|
dec36fd47d
|
Added new method to check if ore is valid. Fixes #150
|
2015-09-19 19:16:43 +01:00 |
|
Modmuss50
|
1a47b56345
|
Fixes #143
|
2015-09-15 18:33:32 +01:00 |
|
Modmuss50
|
2b4daf86bb
|
Fixes #145
|
2015-09-15 08:30:30 +01:00 |
|
modmuss50
|
8aafd118f5
|
Added fluid power manager, imports from forestry and bc
|
2015-09-08 18:39:59 +01:00 |
|