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
|
692c89a6a0
|
Fixes #327
|
2016-01-13 17:17:53 +00:00 |
|
modmuss50
|
2b54516bdd
|
Fixes #321 - And I tested it so I know it works
|
2016-01-09 11:41:16 +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 |
|
modmuss50
|
c791bcdeb5
|
update to new RebornCore
|
2015-12-30 23:25:36 +00:00 |
|
Modmuss50
|
08c0e2d81e
|
Fixes #299
|
2015-12-14 11:06:25 +00:00 |
|
Modmuss50
|
9bb3aad137
|
Update to new RebornCore
|
2015-12-11 19:48:16 +00:00 |
|
modmuss50
|
f7477f5496
|
Removed fluid sources from creative tab.
|
2015-12-06 10:35:37 +00:00 |
|
modmuss50
|
20af49394f
|
Fluid rendering, no more wasted block states
|
2015-12-05 19:37:42 +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
|
94a2229ed7
|
All block textures now work
|
2015-11-27 19:54:34 +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
|
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
|
d56e6752c0
|
A lot of stuff looks better now
|
2015-11-24 22:58:18 +00:00 |
|
Modmuss50
|
bce444a4ff
|
0
|
2015-11-23 20:34:05 +00:00 |
|
Modmuss50
|
839647ed85
|
734
|
2015-11-23 19:51:40 +00:00 |
|
Modmuss50
|
ef82ceb714
|
790
|
2015-11-23 19:37:39 +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
|
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
|
2c31b9211c
|
Started work on the player detector.
|
2015-11-18 20:59:08 +00:00 |
|
Modmuss50
|
08cbe33f00
|
Fixes #263
|
2015-11-18 20:14:46 +00:00 |
|
Modmuss50
|
276bf8355f
|
Computer Cube now shows PDA gui
|
2015-11-18 19:51:41 +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
|
f42c127201
|
Added basic fustion reactor multiblock checking.
|
2015-11-16 15:20:19 +00:00 |
|
Modmuss50
|
19d269b1de
|
Fixes #271
|
2015-11-16 11:17:36 +00:00 |
|
Modmuss50
|
2331e3c35d
|
Fixes #255 and fixes #258
|
2015-11-12 21:38:11 +00:00 |
|
Modmuss50
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +00:00 |
|
Modmuss50
|
842fa421ae
|
Fixes #243
|
2015-11-11 17:00:18 +00:00 |
|
Modmuss50
|
1618a5ca6d
|
Work for #243 The charge bench has no texture
|
2015-11-11 13:20:03 +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
|
e3da8073ed
|
Fixes #222
|
2015-11-02 15:18:10 +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 |
|
gigabit101
|
fcc09445a9
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-01 16:04:52 +00:00 |
|
gigabit101
|
e0c99b8ef7
|
fixed Quantum tank dropping fluid items when broken closes #210
|
2015-11-01 16:04:41 +00:00 |
|
modmuss50
|
5b57f7f909
|
Fixes blocks not dropping correctly.
|
2015-11-01 15:58:34 +00:00 |
|
modmuss50
|
d4607706b8
|
Fixes #213
|
2015-11-01 14:33:04 +00:00 |
|
modmuss50
|
a74154688c
|
Fixes #190
|
2015-10-17 20:21:43 +01:00 |
|
gigabit101
|
a8ea0f55e7
|
Removed a load of un needed junk from other versions of Gtech
|
2015-10-09 21:55:54 +01:00 |
|