Modmuss50
|
3799eb3eb2
|
Work for #182
|
2015-11-11 08:33:05 +00:00 |
|
Modmuss50
|
f326dbfec9
|
Fixes #219 Potentialy breaking for MT scripts.
|
2015-11-11 08:21:21 +00:00 |
|
modmuss50
|
a8bcb76db6
|
Revert "Now checks that an item in a stack is not null, will throw a NPE if one is found."
This reverts commit a483d48a2f.
|
2015-11-08 19:46:11 +00:00 |
|
modmuss50
|
bde2abe01d
|
Removed scala import
|
2015-11-08 17:58:07 +00:00 |
|
modmuss50
|
a483d48a2f
|
Now checks that an item in a stack is not null, will throw a NPE if one is found.
|
2015-11-08 17:45:32 +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
|
678a44937f
|
Should fix #211
|
2015-11-07 08:58:26 +00:00 |
|
Modmuss50
|
9d9a1dba60
|
Fixes #231
|
2015-11-03 19:42:49 +00:00 |
|
Modmuss50
|
df3142d7ec
|
Disabled asm stripper, test for #229 and #218
|
2015-11-03 13:22:49 +00:00 |
|
Modmuss50
|
2c56961289
|
Fixes #226
|
2015-11-03 11:18:22 +00:00 |
|
Modmuss50
|
269c97497f
|
Cables can now be placed inside existing multiparts
|
2015-11-02 21:49:41 +00:00 |
|
Modmuss50
|
88f4737772
|
Version 0.5.6
|
2015-11-02 21:22:52 +00:00 |
|
Modmuss50
|
e3da8073ed
|
Fixes #222
|
2015-11-02 15:18:10 +00:00 |
|
Modmuss50
|
65d20ec431
|
Fixes #221 and hides the multiblock when the world is closed.
|
2015-11-02 15:15:22 +00:00 |
|
Gigabit101
|
cc49f03ee5
|
Merge pull request #220 from MrBretze/master
Adding iron alloy smelter to not enough items and fix ChargedHud (possible crash)
|
2015-11-02 01:52:09 +00:00 |
|
MrBretzel
|
1307406e10
|
Adding iron alloy smelter to not enough items and fix ChargedHud possible crash
|
2015-11-01 23:10:32 +01:00 |
|
Modmuss50
|
e93b29545e
|
You saw nothing :)
Just some debug code
|
2015-11-01 17:09:46 +00:00 |
|
gigabit101
|
57b85450e6
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-01 16:55:02 +00:00 |
|
gigabit101
|
206d09ed31
|
Added a bunch more localization
|
2015-11-01 16:54:58 +00:00 |
|
modmuss50
|
50a830a101
|
Fixes #207
|
2015-11-01 16:45:58 +00:00 |
|
modmuss50
|
dedb00aa7e
|
Fixed console spam
|
2015-11-01 16:31:13 +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
|
4ab88e0aae
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-01 16:10:46 +00:00 |
|
modmuss50
|
12cfe38a50
|
Fixes #212 now you need to hold shift to see our info
|
2015-11-01 16:10:36 +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
|
2f88e819a3
|
Mulitblock preview now renders behind the block.
|
2015-11-01 16:04:19 +00:00 |
|
modmuss50
|
b2be570adb
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-01 15:58:44 +00:00 |
|
modmuss50
|
5b57f7f909
|
Fixes blocks not dropping correctly.
|
2015-11-01 15:58:34 +00:00 |
|
gigabit101
|
824d7d0e8e
|
Added button to blast furnace gui to show multiblock in world
|
2015-11-01 15:58:06 +00:00 |
|
gigabit101
|
9dcc36adfe
|
fixed the double click sound when pressing back button
changed all text colour to white until config is in
|
2015-11-01 15:15:44 +00:00 |
|
modmuss50
|
2483dc0c2f
|
Work for #212
|
2015-11-01 14:43:06 +00:00 |
|
modmuss50
|
227d5fe19b
|
Fixes #214
|
2015-11-01 14:38:47 +00:00 |
|
modmuss50
|
1342eb90cf
|
Fixes #216
|
2015-11-01 14:36:44 +00:00 |
|
modmuss50
|
d4607706b8
|
Fixes #213
|
2015-11-01 14:33:04 +00:00 |
|
modmuss50
|
8e6de190c0
|
Fixes #208
|
2015-10-28 18:50:28 +00:00 |
|
modmuss50
|
dabe79a877
|
Removed ChatColor and replaced with ChatFormatting
|
2015-10-25 18:55:49 +00:00 |
|
modmuss50
|
edddb552c8
|
Version 0.5.5
|
2015-10-25 10:08:47 +00:00 |
|
modmuss50
|
cf34fe1f1f
|
Large improvement to power system, fixes #204
|
2015-10-25 09:58:57 +00:00 |
|
Modmuss50
|
3f47e89f85
|
Merge pull request #206 from MrBretze/master
Fix #196 and mini clean up
|
2015-10-25 08:18:18 +00:00 |
|
MrBretzel
|
28b0a5da8c
|
Move to png
Fix bug
|
2015-10-25 08:14:08 +01:00 |
|
MrBretzel
|
67398ca163
|
Move to jpeg
just a bug...
|
2015-10-25 08:13:38 +01:00 |
|
MrBretzel
|
b72e86c7fd
|
Remove .idea to .gitignore
|
2015-10-25 08:08:53 +01:00 |
|
MrBretzel
|
712eac915b
|
Clean up import
|
2015-10-25 08:05:45 +01:00 |
|
MrBretzel
|
b8487f5eb5
|
Fix #196 and mini clean up
|
2015-10-25 07:34:37 +01:00 |
|
modmuss50
|
6b6bd0bdd0
|
Some small changes to the multi parts
|
2015-10-23 16:04:56 +01:00 |
|
Modmuss50
|
37d0dbefd2
|
Merge pull request #202 from MrBretze/master
Quick fix for #201
|
2015-10-23 16:00:23 +01:00 |
|
