Modmuss50
219f2a0df7
Quick Fix for MT Scripts
2015-11-17 18:19:12 +00:00
Modmuss50
96492bd87e
Fixes #275 again
2015-11-17 13:31:34 +00:00
Modmuss50
5e079afd05
Small fix to reactor MT support
2015-11-17 11:20:58 +00:00
Modmuss50
9283e46a1f
Fixes #275 and added world placement helper for reactor
2015-11-17 11:12:58 +00:00
Mazdallier
6efa1de164
Update fr_FR.lang
...
all done
2015-11-17 10:22:27 +01:00
Modmuss50
8c85aeb4d3
Added minetweaker support for Fusion Reactor
2015-11-17 08:24:41 +00:00
Modmuss50
50a45560ab
Fixes #274 and Fixes #268
2015-11-17 07:52:47 +00:00
Modmuss50
3fc8587200
Added info to the gui
2015-11-16 21:51:14 +00:00
Modmuss50
7db2e0dc8c
Polish to the reactor
2015-11-16 21:50:09 +00:00
Modmuss50
b506c2e091
Added NEI support for fusion reactor
2015-11-16 21:24:10 +00:00
Modmuss50
a63128aa7e
Added Fusion Reactor
2015-11-16 21:10:39 +00:00
Modmuss50
473a981f51
Hot fix 0.6.1 and Fusion Reactor API
2015-11-16 20:27:45 +00:00
Modmuss50
1321422edf
Fixes #273
2015-11-16 19:01:27 +00:00
Modmuss50
f42c127201
Added basic fustion reactor multiblock checking.
2015-11-16 15:20:19 +00:00
Mazdallier
81b45789ac
Update fr_FR.lang
...
big update to continuous line 695
2015-11-16 15:40:43 +01: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
9b1378a64c
Fixes #269
2015-11-15 21:12:31 +00:00
Modmuss50
df5bd1422a
Fixes #267
2015-11-15 20:54:31 +00:00
Modmuss50
78a7bcf4bc
Recoded MT support
2015-11-15 20:51:54 +00:00
modmuss50
16f1a8de17
Charge bench recode.
2015-11-13 19:00:17 +00:00
gigabit101
421597fbab
Added missing localizations closes #242
2015-11-13 16:48:51 +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
1551164cd6
Some work on recoding MT support
2015-11-13 13:18:48 +00:00
Modmuss50
bb2914bf5d
Fix imports
2015-11-13 08:28:32 +00:00
Modmuss50
de1d036b33
Revert "Fixes #219 Potentialy breaking for MT scripts."
...
This reverts commit f326dbfec9
2015-11-13 08:27:02 +00:00
Modmuss50
a7001bbfd7
Revert "fixes #219 again"
...
This reverts commit d562e1222a
2015-11-13 08:26:51 +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
c4b50b5c79
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-11-12 21:01:53 +00:00
gigabit101
da631dd25e
Fixed Isidedness of Centrifuge closes #262
2015-11-12 21:01:36 +00:00
Modmuss50
08a3636e72
Fixes #260
2015-11-12 21:00:03 +00:00
gigabit101
a499cf2b09
Removed fake output slot from rolling machine closes #259
2015-11-12 20:50:58 +00:00
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 363adeb681Fixes #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
Modmuss50
cb6551c7ca
Fixed compile error with last commit
2015-10-07 11:17:09 +01:00
Modmuss50
6a404ba617
Fixes #166
2015-10-07 11:15:55 +01:00
Modmuss50
9c52e0ace7
Fixes #170 and fixes #167
2015-10-07 08:34:24 +01:00
Modmuss50
7d052a3292
Removed last ic2 energy class
2015-10-07 08:20:45 +01:00
Modmuss50
3a9c469965
Fixes #171
2015-10-07 08:19:39 +01:00
modmuss50
e257c424e2
Quick fix for crash, full fix coming tomorrow
2015-10-06 22:57:38 +01:00
Modmuss50
d490d00ab0
Removed forestry version checker, will try fix again later
2015-10-06 21:51:09 +01:00
Modmuss50
599ab5d634
Clean up forestry version checker
2015-10-06 20:47:50 +01:00
Modmuss50
4683f1450f
Disables forestry intergtation when not using version 4 or higher
2015-10-06 20:46:03 +01:00
Modmuss50
9c3bc97af2
Fixes #162 , sorry if it breaks some of your tiles.
2015-10-06 20:39:19 +01:00
Modmuss50
3b7001d44f
Fixes some crashes, added new command, closes #165
2015-10-06 20:35:54 +01:00
Modmuss50
2a314aa4bb
Auto clean of cable class
2015-10-05 17:44:38 +01:00
Modmuss50
20a57d298f
Massive improvement to parts, should work a lot better now
...
@gigabit101 you asked for it, now you just need to place covers on ic2
cables, and you can place covers in the conecting bit.
Also fixes, slow responsiveness when placing/breaking cables
Also fixes cables rendering incorectally when a cover is placed between
two cables.
2015-10-05 17:39:52 +01:00
Modmuss50
04a21f4dc7
Fixes #163
2015-10-05 11:18:44 +01:00
modmuss50
b0c77d4d22
Fixed server crash
2015-10-03 20:29:02 +01:00
modmuss50
91a0d76f46
Disabled recipe config manager(use mine tweaker)
2015-10-03 19:36:49 +01:00
modmuss50
fd4f52e27e
Fixed some issues with cables when using ic2 classic.
2015-10-03 19:21:28 +01:00
modmuss50
a390a37cb1
Fixes forestry saw mill recipes
2015-10-03 12:39:18 +01:00
modmuss50
3708a49bb9
Initial update to forestry 4(Sawmill recipes are not working)
2015-10-03 10:21:13 +01:00
modmuss50
c30633b5d3
Added config for disabling connected textures
2015-10-02 21:09:57 +01:00
modmuss50
146deb0e8b
Added recipes to IC2 classic, fixed recipes when using ic2, fixes #158
2015-10-02 21:01:30 +01:00
Modmuss50
a6792f37c6
Fixes #155 thanks @XuPuPG
2015-09-29 19:13:46 +01:00
modmuss50
219570f288
Added connected textures to reinforced casing
2015-09-26 16:21:50 +01:00
Modmuss50
f5c31a6a31
Added connected textures for the lesu
2015-09-26 16:13:42 +01:00
modmuss50
f889b9a051
Some crappy textures, adds all connected textures
2015-09-26 15:54:25 +01:00
Modmuss50
d942e6f52e
Added connected textures to advanced machine casing.
2015-09-26 15:47:54 +01:00
Modmuss50
fcec162559
inital connected textures, still needs some work.
2015-09-26 13:54:58 +01:00
Modmuss50
628fb11961
Some code work on the connected texture system, will be redone to use 2 textures not one.
2015-09-26 13:10:12 +01:00
modmuss50
79d6f81dda
Some texture work on the new connected textures
2015-09-26 13:09:39 +01:00
Modmuss50
bc5d9cf88b
Started work on custom connected texture system
...
This will make the textures at runtime, so we will only need to have 2
sprites to do it
2015-09-26 09:16:08 +01:00
Modmuss50
2dfaf5e739
Added saving for the PDA
2015-09-23 20:42:42 +01:00
Modmuss50
081f16a533
Removed Farm
2015-09-23 18:58:46 +01:00
gigabit101
97d990e316
small changes to PDA and a start on PdaConfig
2015-09-23 18:29:34 +01:00
Modmuss50
1f2e703c4f
Fixed incorrect location for Blocks API
2015-09-23 17:37:25 +01:00
Modmuss50
3f4b59faaf
Fixes #130
2015-09-23 17:27:41 +01:00
modmuss50
ccaabdd230
Started work on adding the recipes back to ic2 classic
2015-09-20 13:55:54 +01:00
modmuss50
dec36fd47d
Added new method to check if ore is valid. Fixes #150
2015-09-19 19:16:43 +01:00
modmuss50
47a8ccadcb
added backwards compatibility for block rotation
2015-09-19 09:38:19 +01:00
modmuss50
148715111f
Renamed TileMeta to TileRotation
2015-09-19 09:31:24 +01:00
modmuss50
aacc73102d
Fixed small issue with get tile meta
2015-09-19 09:27:13 +01:00
modmuss50
5d5f4ec929
Fixes #149
2015-09-19 09:23:39 +01:00
Modmuss50
c424e74473
closes #146
2015-09-16 08:24:58 +01:00
Modmuss50
1a47b56345
Fixes #143
2015-09-15 18:33:32 +01:00
Modmuss50
dc1259c9f6
Fixed some textures
2015-09-15 18:26:29 +01:00
Modmuss50
2b4daf86bb
Fixes #145
2015-09-15 08:30:30 +01:00
Modmuss50
bd1540b27b
Fixed fluid power value importing
2015-09-14 21:34:56 +01:00
Modmuss50
62f68bb5b7
Fixes #144
2015-09-14 21:26:31 +01:00
Modmuss50
29d47ec37e
Fixes #141
2015-09-14 21:23:07 +01:00
Modmuss50
cf49f01042
Added better support for ic2 classic power system
2015-09-14 21:07:44 +01:00
Modmuss50
0bf7e1968e
Fixed ic2 classic support on the master!
2015-09-14 21:05:26 +01:00
modmuss50
61a51b52a7
Fixes #83
2015-09-11 13:34:20 +01:00
modmuss50
96d5304d07
Fixed small issue when not copying the item stack, might help #83
2015-09-11 13:25:33 +01:00
Modmuss50
11fd755619
Fixed issues with the tank not syncing on the disel genertaor
2015-09-10 19:39:00 +01:00
Modmuss50
cd04ae5693
Added command to view fluid fuel power values
2015-09-10 17:48:22 +01:00
Modmuss50
2cf90af757
Fixed #140
2015-09-10 17:41:59 +01:00
modmuss50
8aafd118f5
Added fluid power manager, imports from forestry and bc
2015-09-08 18:39:59 +01:00
modmuss50
72799a9474
Added some fuels to forestry's api, might write our own and import bc's and forest into ours.
2015-09-08 13:26:24 +01:00
modmuss50
67e6182e44
Fixed centrifuge block icons
2015-09-07 21:17:07 +01:00
gigabit101
61120ed30b
Added Ae2 and Logistic pipe support to Quantum Chest
2015-09-07 20:48:35 +01:00
modmuss50
e02b1518d2
updates to the aesu gui
2015-09-05 21:09:37 +01:00
Modmuss50
adf6c95331
Small improvements to the multiblock renderer
2015-09-05 15:29:21 +01:00
Modmuss50
fe11409b4e
Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles
2015-09-05 11:44:41 +01:00
Modmuss50
5fe5fce53c
Fixes #44 Closes #139
2015-09-05 11:40:05 +01:00
Modmuss50
d3e860edb2
Inital port to tile based meta
2015-09-05 09:17:58 +01:00
Nagisa·Jang
af3b605b24
Update zh_CN.lang
2015-09-02 21:34:09 +08:00
modmuss50
ebc685ba3d
Improvements to the compat manager.
2015-08-30 21:16:22 +01:00
Nagisa·Jang
827cf6f969
Update zh_CN.lang
2015-08-30 20:02:07 +08:00
modmuss50
21628a78cb
auto optimise png files
2015-08-27 16:47:32 +01:00
modmuss50
15b9671dc4
fixes #120
2015-08-27 13:09:31 +01:00
modmuss50
d33c93005d
Added all of the machines to minetweaker. (untested)
2015-08-27 10:22:17 +01:00
modmuss50
c8e7e923ed
Added more minetweaker support
2015-08-27 09:04:41 +01:00
modmuss50
f9823b6ba6
Fixed minetweaker support for AlloyFurnace
2015-08-27 08:55:34 +01:00
modmuss50
eb25b96355
fixes #129
2015-08-26 10:48:09 +01:00
modmuss50
2e00382632
Some work for #115
2015-08-26 10:37:28 +01:00
modmuss50
d4c663ae72
fixes #116
2015-08-26 09:55:04 +01:00
modmuss50
cb59fff1f0
fixes #126 and fixes #127
2015-08-26 09:52:56 +01:00
modmuss50
103c0b79e4
fixes #119
2015-08-26 00:44:44 +01:00
modmuss50
0154f5a21a
Fixes #124
2015-08-26 00:35:04 +01:00
modmuss50
4d87a27509
fixes #118
2015-08-26 00:27:12 +01:00
modmuss50
fdc6ccf2a0
fixes #122
2015-08-26 00:20:32 +01:00
modmuss50
6fa53f2884
fixes #212
2015-08-26 00:17:04 +01:00
modmuss50
a7154f5056
fixes #117
2015-08-25 18:43:18 +01:00
modmuss50
da538c7d77
fixes #125
2015-08-25 18:38:50 +01:00
modmuss50
e7f85022a4
Merge branch 'master' of https://github.com/Amamiya-Nagisa/TechReborn into Amamiya-Nagisa-master
...
Conflicts:
src/main/resources/assets/techreborn/lang/zh_CN.lang
2015-08-25 18:23:43 +01:00
Nagisa·Jang
e5f23dc073
Update zh_CN.lang
2015-08-23 22:08:24 +08:00
gigabit101
73b85de0ae
fix pda gui texture
2015-08-17 18:45:34 +01:00
gigabit101
8233f1ec8f
color change a format
2015-08-17 18:44:54 +01:00
gigabit101
e8e78c1099
Added multiblock page (WIP)
2015-08-17 18:15:19 +01:00
gigabit101
834b14bc31
Added a button to pda to open Ingame configs
2015-08-17 17:30:54 +01:00
gigabit101
fa00e77ef6
removed some unneeded code
2015-08-17 17:10:20 +01:00
gigabit101
6f549337cd
Added version page
2015-08-17 16:51:58 +01:00
gigabit101
7f889958a2
Cleaner gui
2015-08-17 15:15:22 +01:00
gigabit101
7a50db2d61
More fancy gui stuff (WIP)
2015-08-16 23:59:47 +01:00
gigabit101
323725be11
PDA will now display mod version
2015-08-16 21:36:10 +01:00
gigabit101
388dfc016d
More small changes to pda
2015-08-16 21:29:12 +01:00
gigabit101
25aeaf371e
added recipe for PDA
2015-08-16 21:19:27 +01:00
gigabit101
958a0b32d0
Added items to the pda
2015-08-16 20:46:35 +01:00
gigabit101
73f28281e3
A few more recipe tweeks and configs
2015-08-16 20:41:23 +01:00
modmuss50
ccb028a202
Tweaked thermal generator, closes #100
2015-08-16 12:17:02 +01:00
modmuss50
5b2bc53cfc
Added gui elements to rolling machine. Fixes #95
2015-08-16 12:03:22 +01:00
modmuss50
364d2d68db
Fixed #103
2015-08-16 11:50:37 +01:00
modmuss50
11e680500f
Fixed crash when RF is disabled
2015-08-16 11:50:25 +01:00
modmuss50
2b979f4c4c
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-08-16 11:19:36 +01:00
modmuss50
00dad58c6d
Fixed some recipes
2015-08-16 11:19:25 +01:00
gigabit101
d17276e96d
Added config's to disable mod integration closes #111
2015-08-15 23:31:02 +01:00
modmuss50
44c5037b28
Added config settings for power net, closes #112
2015-08-15 17:03:28 +01:00
modmuss50
8c421d20dd
Some small tweaks to the cloaking device
2015-08-14 00:28:28 +01:00
modmuss50
65f0bb2175
Fixed last PR
2015-08-14 00:09:44 +01:00
primetoxinz
87877c647a
remove random import
2015-08-13 19:06:11 -04:00
primetoxinz
1ac0897c0e
Fix invisibility potions and cloaking device
2015-08-13 19:05:10 -04:00
primetoxinz
199bbf28b6
Finished Cloaking Device
2015-08-13 18:46:01 -04:00
primetoxinz
0ac12866e2
couple more textures
2015-08-13 16:58:31 -04:00
primetoxinz
acfa840120
Fix most texture names
2015-08-13 16:53:37 -04:00
primetoxinz
fb38973684
actually fixes it
2015-08-13 16:52:55 -04:00
primetoxinz
bd90b40db6
fix hot tungsten steel texture
2015-08-13 16:41:47 -04:00
modmuss50
6d46a03e5d
Fixes #104 and #105
2015-08-13 12:47:55 +01:00
modmuss50
c63e9577fe
Fixed massive multi blocks
2015-08-10 22:27:40 +01:00
gigabit101
59590e6f76
Added back buttons
2015-08-10 22:19:15 +01:00
gigabit101
cc9c496f6e
Small changes to PDA
2015-08-10 22:04:54 +01:00
modmuss50
fe049cc160
Added Blocks and items to the api
2015-08-10 19:41:28 +01:00
modmuss50
2ff03573d9
Added logic to alloy furnace
2015-08-10 19:28:52 +01:00
gigabit101
7f86d116cb
fixed pda texture
2015-08-10 18:31:07 +01:00
gigabit101
6a20c0f160
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-08-10 18:30:34 +01:00
gigabit101
f58fbfe0e8
Added alot of work on the PDA still {WIP}
2015-08-10 18:30:19 +01:00
modmuss50
ab880fba98
Merge branch 'master' of https://github.com/TechReborn/TechReborn
2015-08-10 14:32:10 +01:00
modmuss50
fb33dda932
Changes the way heat is calculated.
2015-08-10 14:32:01 +01:00
gigabit101
d41f7470b9
fixed localization for sawmill gui
2015-08-09 18:35:35 +01:00
modmuss50
404bbf6797
Fixed #101
2015-08-09 16:45:17 +01:00
modmuss50
e0ab0af822
Reformatted all the code using the default intelji formatting options.
2015-08-09 11:05:32 +01:00
modmuss50
2f63a24070
Small improvements to the version checker
2015-08-09 10:57:13 +01:00
TehporP
24a68bd292
Update zh_CN.lang
2015-08-09 13:21:53 +08:00
TehporP
7dc3a50b1c
Update zh_CN.lang
2015-08-09 09:04:50 +08:00
TehporP
31c17617b6
Update zh_CN.lang
2015-08-09 08:58:52 +08:00
TehporP
c970ec3445
Update zh_CN.lang
2015-08-09 08:36:21 +08:00
Nagisa·Jang
74cb2a4107
Update zh_CN.lang
2015-08-08 22:43:49 +08:00
TehporP
a1551967ec
Create zh_CN.lang
...
I will start translating job a bit later
2015-08-08 08:54:24 +08:00
modmuss50
009bf28b95
Added version checker
2015-08-06 18:39:13 +01:00
modmuss50
a6431776a8
Fixed power disappearing
2015-08-05 19:32:01 +01:00
modmuss50
4404122002
Fixes #93 , use energy was inverted, canUseEnergy was always returning true
2015-08-05 18:21:56 +01:00
modmuss50
56c747bb93
Should help with the storage block recipes
2015-08-05 15:51:35 +01:00
modmuss50
9e346e6061
Added machine parts, added some recipes. Fixes #92
2015-08-05 15:35:06 +01:00
modmuss50
79f14f8be6
Fixes Crash without CodeChickenLib installed closes #94
2015-08-05 15:10:29 +01:00
modmuss50
f8803f3be1
Removed the univseral jar appendix, fixed small typo
2015-08-05 10:13:05 +01:00
gigabit101
4c2c69f84e
Added cloaking device {WIP}
2015-08-04 21:12:27 +01:00
gigabit101
8a4aea90aa
Clean up for Dungeon loot code
2015-08-04 21:12:02 +01:00
gigabit101
7905573e23
Fixed Quantum chests and tanks not having a hardness
2015-08-04 20:50:58 +01:00
modmuss50
1d6504c7ba
Revert "Small re-factor to the RecipeRemover"
...
This reverts commit 9c94b045b3
2015-08-04 10:31:41 +01:00
modmuss50
9c94b045b3
Small re-factor to the RecipeRemover
2015-07-27 19:40:00 +01:00
modmuss50
b9d880abe2
Fixed the silk touch issue again
2015-07-27 19:28:52 +01:00
modmuss50
219aa69860
Fixed the IDSUManager crashing on startup and resetting the power values.
2015-07-27 19:18:42 +01:00
modmuss50
3db7271fd1
Added recipe list exporting to json
2015-07-27 14:13:22 +01:00
modmuss50
b1682a64bd
Fixes #90
2015-07-26 16:13:29 +01:00
modmuss50
5927eaca4c
Recoded idsu, closes #81
2015-07-26 16:01:27 +01:00
modmuss50
f433aa706a
Fixed crashing when ic2 is not installed
2015-07-26 15:35:02 +01:00
modmuss50
d8e8f45993
Fixed incorrect rf calculation values
2015-07-26 14:46:56 +01:00
modmuss50
e8bbbcc7c3
Some changes to the way rf is handled.
2015-07-25 17:55:03 +01:00
modmuss50
26f63e04f7
some small changes
2015-07-25 17:11:03 +01:00
modmuss50
c869e1656c
Removed ic2 core dependency, should now only need to use the api
2015-07-25 16:37:11 +01:00
modmuss50
07c9ee97d4
Added test recipe for blast furnace
2015-07-25 15:32:20 +01:00
modmuss50
aff8c26c49
Fixes energy gui scaling
2015-07-25 15:16:22 +01:00
modmuss50
466f50b232
fixes #44
2015-07-25 15:13:52 +01:00
gigabit101
fb3855a078
closes #87
2015-07-24 23:18:30 +01:00
gigabit101
2d16b194e8
this might have been a issue at some point
2015-07-24 22:30:23 +01:00
gigabit101
bac2cdcbc6
closes #55
2015-07-24 22:29:00 +01:00
gigabit101
5636dc373f
closes #79
2015-07-24 21:54:18 +01:00
