gigabit101
|
322cc072a8
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-11-12 20:46:44 +00:00 |
|
gigabit101
|
4d6f961b9c
|
Fixed Implosion Compressor gui closes #261
|
2015-11-12 20:46:37 +00:00 |
|
Modmuss50
|
c0665e5c80
|
Fixes #257
|
2015-11-12 20:41:01 +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 |
|
Modmuss50
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +00:00 |
|
Modmuss50
|
5419067213
|
Work for #242
|
2015-11-12 08:32:14 +00:00 |
|
Modmuss50
|
d562e1222a
|
fixes #219 again
|
2015-11-12 08:22:47 +00:00 |
|
gigabit101
|
c2dcaf1902
|
Fixed Quantum Chest/Digital Chest stored items closes #247
|
2015-11-11 21:37:31 +00:00 |
|
Modmuss50
|
9b6383a548
|
fixes #251
|
2015-11-11 18:38:43 +00:00 |
|
Modmuss50
|
25158d872f
|
Removed explosions when raining
|
2015-11-11 18:33:15 +00:00 |
|
Modmuss50
|
351d7afadb
|
Update reborn core
|
2015-11-11 17:37:14 +00:00 |
|
Modmuss50
|
85e7bfacde
|
Added ore unifier, disbled by defualt.
|
2015-11-11 17:25:55 +00:00 |
|
Modmuss50
|
c120c37723
|
Fixes #250
|
2015-11-11 17:12:59 +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
|
8f45d418e3
|
Fixes crafting for lapotronicOrb
|
2015-11-11 16:50:28 +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
|
e4760e559b
|
Fixes #249
|
2015-11-11 15:30:03 +00:00 |
|
Modmuss50
|
6ab71cb612
|
Fixed compile error
|
2015-11-11 15:28:20 +00:00 |
|
Modmuss50
|
47a466ef21
|
Some fixes for #242
|
2015-11-11 15:24:13 +00:00 |
|
Modmuss50
|
7135075ac6
|
Removed power indicator on sawmill
|
2015-11-11 15:17:24 +00:00 |
|
Modmuss50
|
1618a5ca6d
|
Work for #243 The charge bench has no texture
|
2015-11-11 13:20:03 +00:00 |
|
Modmuss50
|
701c658323
|
Fixes all of #242
|
2015-11-11 13:17:14 +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
|
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
|
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 |
|
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
|
cf34fe1f1f
|
Large improvement to power system, fixes #204
|
2015-10-25 09:58:57 +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
|
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 |
|
MrBretzel
|
2c1950df75
|
Possible fix for #201
Possible fix for #201
|
2015-10-23 06:32:30 +02:00 |
|
modmuss50
|
95d51a7cb7
|
fixes #199 and closes #200
|
2015-10-22 21:23:17 +01:00 |
|
modmuss50
|
50fa2e8a1d
|
Fixes #194
|
2015-10-22 18:19:05 +01:00 |
|
MrBretzel
|
94b0123a3b
|
Fixed #192
|
2015-10-22 13:34:11 +02:00 |
|
modmuss50
|
a74154688c
|
Fixes #190
|
2015-10-17 20:21:43 +01:00 |
|
Modmuss50
|
2d3c6a8dec
|
Charge bench now uses new power system, also uses old one
|
2015-10-14 21:42:45 +01:00 |
|
Modmuss50
|
9d824e76ca
|
Most of the stuff uses the new item power net now
|
2015-10-14 21:37:21 +01:00 |
|
Modmuss50
|
531315e55f
|
Move cloaking device to new power system, fix some issues with it.
|
2015-10-14 21:08:34 +01:00 |
|
Modmuss50
|
2d06d726b4
|
Started work on rewriting the item power API
|
2015-10-14 20:57:44 +01:00 |
|
Modmuss50
|
7ae4ec1a98
|
Clean up of ic2 classic recipes
|
2015-10-14 13:39:05 +01:00 |
|
Modmuss50
|
652bea5bcd
|
More tweaks based off #189
|
2015-10-14 13:31:20 +01:00 |
|
Modmuss50
|
cae4aad955
|
fixes #189
|
2015-10-14 13:27:43 +01:00 |
|
Modmuss50
|
cd32fe255c
|
Added ore dic for gems back, fixes #188
|
2015-10-12 07:54:28 +01:00 |
|
modmuss50
|
81c498086a
|
closes #176
|
2015-10-10 16:51:56 +01:00 |
|
modmuss50
|
a34a005b7b
|
Fixes #183
|
2015-10-10 16:45:12 +01:00 |
|
modmuss50
|
13383bd2a9
|
Should fix #186
|
2015-10-10 16:42:21 +01:00 |
|
gigabit101
|
90f0b0ae5b
|
Little work on multiblock page
|
2015-10-09 23:16:44 +01:00 |
|
gigabit101
|
14b387dd56
|
closes #180
|
2015-10-09 22:31:26 +01:00 |
|
gigabit101
|
4a12aaf581
|
closes #178
|
2015-10-09 22:23:21 +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 |
|
gigabit101
|
5a230b20a2
|
Fix's #185
|
2015-10-09 21:10:20 +01:00 |
|
Modmuss50
|
8a494a392c
|
Fixes #172
|
2015-10-08 08:24:48 +01:00 |
|
Modmuss50
|
caca45d86b
|
Removed Iron Gear Texture
|
2015-10-07 16:09:14 +01:00 |
|
Modmuss50
|
75e2bd4733
|
Machines now explode when they come in contact with rain.
|
2015-10-07 15:41:26 +01:00 |
|
