Commit graph

2587 commits

Author SHA1 Message Date
Modmuss50
3f41e26ece Fixes some issues with the fustion reactor. 2015-11-18 17:02:22 +00:00
Gigabit101
885a6ad76d Merge pull request #276 from Mazdallier/patch-2
Update fr_FR.lang
2015-11-18 16:42:00 +00:00
Modmuss50
93d1ff57b7 Fixed in world multiblock preview 2015-11-18 11:10:03 +00:00
Modmuss50
758d918bdb Got the Vacuum Freezer working. 2015-11-18 08:35:34 +00:00
Modmuss50
8fd59c896b Fixes #277 2015-11-18 08:29:51 +00:00
Modmuss50
3114576e7b Most of the Vacuum Freezer(Not working just yet) 2015-11-17 21:48:06 +00:00
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 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
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
15286baaa5 Started adding automated tests 2015-09-28 20:30:24 +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
modmuss50
36ecb9c3f3 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-07-23 16:57:21 +01:00
modmuss50
ef11f111ed Started work on a way to find duplicate items 2015-07-23 16:57:06 +01:00
Modmuss50
e1b0c7af06 Merge pull request #86 from Mazdallier/patch-1
Update fr_FR.lang
2015-07-23 16:19:37 +01:00
modmuss50
8725c5932d It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items. 2015-07-23 16:19:07 +01:00
Mazdallier
c1643152a9 Update fr_FR.lang 2015-07-23 16:38:02 +02:00
modmuss50
496151fcae Fixed aesu powers in creative tab, more work moving away from ic2 core and only needing ic2 api 2015-07-23 13:42:20 +01:00
modmuss50
277e5e5e45 Fix incorrect EU-RF conversion 2015-07-23 13:07:20 +01:00
modmuss50
e9ece63a99 Initial untested port to new internal power system.
This resets all the machines internal power buffer
2015-07-23 12:52:51 +01:00
modmuss50
984b502ded fixes #85 , Fixes issues with RF output 2015-07-23 10:13:37 +01:00
modmuss50
62e5ccddd0 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-07-23 09:38:28 +01:00
modmuss50
79235f15ba Fixed gui's changing colour while in f3 2015-07-23 09:38:08 +01:00
modmuss50
bb98d76eea Fixed incorrect storage block recipes 2015-07-23 09:30:38 +01:00
gigabit101
ab72f7dced Started adding progress bars to other machines 2015-07-21 17:53:43 +01:00
gigabit101
0880ffac72 Added configs to Aesu 2015-07-21 17:53:20 +01:00
gigabit101
f96e55737f fixed charge hud showing when disabled closes #84 2015-07-21 14:49:05 +01:00
modmuss50
663b5f2f75 Fixed some issues with the Industrial Electrolyzer 2015-07-20 15:38:36 +01:00
modmuss50
462aa20710 Fixed the BlastFurnace 2015-07-20 15:19:23 +01:00
modmuss50
29398d50dd Added Farm inventory cable 2015-07-14 17:18:00 +01:00
modmuss50
b6807d249d Some major tweaks to the part system, broken old cables! 2015-07-14 16:45:45 +01:00
modmuss50
d2b2f34d64 Some tweaks to the farm 2015-07-13 21:31:11 +01:00
modmuss50
fadba8db41 Even more work on the farm 2015-07-13 21:21:30 +01:00
modmuss50
5d574e0540 Some more work on the tree farm 2015-07-13 20:54:32 +01:00
modmuss50
ef5d81d8e2 Some more work on the farm 2015-07-13 16:24:50 +01:00
modmuss50
c160abf176 Started work on the farm, some changes to the idsu, its still broken 2015-07-13 13:54:44 +01:00
modmuss50
be33bdc148 Fixes #80 2015-07-12 16:51:14 +01:00
modmuss50
1a3cd0c54e fixes #78 2015-07-11 18:19:08 +01:00
modmuss50
a48dab6dfa Fixed ruby to steel 2015-07-11 18:12:06 +01:00
Mazdallier
e4cfa69ba1 Update fr_FR.lang
config update
2015-07-08 14:08:56 +02:00
modmuss50
fdc23c5ae9 Added support for EE3-Compataibilty 2015-07-06 20:33:50 +01:00
gigabit101
91c9a28796 Removed ruby to ruby dust recipe close #69 2015-07-06 16:52:12 +01:00
gigabit101
a07af2d70d moved battery slot on Centrifuge to correct position 2015-07-06 16:49:11 +01:00
gigabit101
179ae2ca42 Now use oredict for plateIridium closes #74 2015-07-06 16:41:17 +01:00
modmuss50
ab384b661a Fixed lesu issue, temp remove rf output 2015-07-03 17:12:31 +01:00
modmuss50
10846270c5 Matterfab now needs scrap 2015-07-03 16:38:31 +01:00
modmuss50
0a82e61ebd Some tweaks to minetweaker support 2015-07-03 08:40:38 +01:00
gigabit101
26eff9bcbf Removed fluid tank from IndustrialElectrolyzer closes #58 2015-07-02 23:39:36 +01:00
modmuss50
b7a9824cd3 Added config setting for eu/rf value 2015-07-02 23:35:10 +01:00
modmuss50
a85d917873 Added minetweaker support to the alloy furnace.
I have no idea on how minetweaker works so could some one help me test?

for #70
2015-07-02 20:45:05 +01:00
modmuss50
85bfa95c1c Some basic work for #70 2015-07-02 20:23:01 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
modmuss50
33898edf7c Rewritten cable render, removed hard dep of QLIb :) 2015-07-02 19:49:30 +01:00
modmuss50
d795d81fba added emc value for lesu 2015-07-02 17:39:04 +01:00
Modmuss50
00c74d8a8e Merge pull request #71 from Mazdallier/patch-1
Update fr_FR.lang
2015-07-02 13:17:38 +01:00
modmuss50
a5505ccd0c Fixed RF not outputting 2015-07-02 13:16:47 +01:00
Mazdallier
c2e77df0b1 Update fr_FR.lang 2015-07-02 13:16:40 +02:00
modmuss50
dcc437c1fe Cleaned up some code 2015-07-02 11:14:21 +01:00
modmuss50
f657270b34 Fixed ClassTransformation 2015-07-02 11:07:52 +01:00
modmuss50
a71b399765 Moved the lesu to the new system, looks like its stripping every thing ;'( 2015-07-01 20:34:22 +01:00
modmuss50
30ff429b6a Moved our energy net to doubles, should be all done(now need to test), added eu to rf conversion 2015-07-01 17:53:03 +01:00
modmuss50
78faca7a19 Implemented the other apis, now need to implement our own 2015-07-01 17:23:29 +01:00
modmuss50
c836e06678 Fixed mcmod.info stuff not getting replaced, removed the appendix on the file name because it was not needed 2015-07-01 16:53:03 +01:00
modmuss50
f81c5c4f8d Clean up of the striping code 2015-07-01 16:49:50 +01:00
modmuss50
5b06a20351 Added ASM Method and Field stripper, more work on own power net 2015-07-01 16:41:40 +01:00
modmuss50
4fae706242 Started work on new power api 2015-07-01 12:56:45 +01:00
Gig
926bcb9f8b more little things 2015-06-30 00:08:40 +01:00
Gig
e216bc3643 Some changes to Isided on for the ChargeBench 2015-06-29 23:43:00 +01:00
Gig
40a97145dc fixed a important check 2015-06-29 23:18:21 +01:00
modmuss50
6c61829ddc Fixed cable drops 2015-06-29 20:19:56 +01:00
modmuss50
963c009648 Fixed parts not loading with the world 2015-06-29 20:04:17 +01:00
modmuss50
664252bc96 fixes #64 2015-06-29 19:18:26 +01:00
modmuss50
2e7f506115 fixes #66 2015-06-29 19:10:26 +01:00
Gig
a063e13612 It works!!!
Charge bench now working needs a texture and recipe
2015-06-29 18:42:20 +01:00
Gig
bfe0d57bc7 Started on ChargeBench only slot 0 works atm 2015-06-29 18:03:40 +01:00
Gig
f2a67a60d4 Added localization to fluids closes #56 2015-06-29 15:53:54 +01:00
Gig
c2deb74a81 Fixed recipe button positions on all machines closes #57 2015-06-29 15:41:04 +01:00
Gig
15d3ad325f bronze now has the correct emc value closes #59 2015-06-29 15:02:19 +01:00
TheQuantumGeneral
d1b41c27aa Update ModRecipes.java
fixing chlorine being referenced as a dust instead of a cell in electrolyser recipe
2015-06-29 19:08:23 +10:00
TheQuantumGeneral
dfc105cb64 Update ContainerThermalGenerator.java
making it only accept fluid containers
2015-06-29 19:07:05 +10:00
Gig
ad12de30d3 Added recipe to get rubydust from rubys 2015-06-28 19:57:35 +01:00
modmuss50
d53a2aeef1 Added rendering back, fixed lag issues with cables 2015-06-28 19:02:31 +01:00
joflashstudios
acb06afd1f Missed some temporary code 2015-06-27 18:13:51 -04:00
joflashstudios
40c01c18a0 Added more Electrolyzer recipes
I can't get the sand --> silicone recipe to take more than 1 block of sand. Help would be appreciated.
2015-06-27 18:12:36 -04:00
modmuss50
2a95225c9c Added rest of base values 2015-06-27 22:35:23 +01:00
modmuss50
8a3d173007 Added some new values 2015-06-27 22:04:52 +01:00
modmuss50
a393964109 Disabled cable rendering 2015-06-27 21:52:29 +01:00
joflashstudios
f2c6959949 Added sawmill recipe
Fixes #61
2015-06-27 14:27:36 -04:00
joflashstudios
5cc58bf2c5 Added more Electrolyzer Recipes
The bone meal --> calcium cell one still isn't working right. @modmuss50, would you be willing to take a look at it sometime?
2015-06-27 14:00:53 -04:00
Gig
3c4439ec5c Sawmill now needs multiblock 2015-06-27 16:10:43 +01:00
Gig
a5a8265c8b Sawmill now renders fluids and so dose recipe handler 2015-06-27 16:07:11 +01:00
Gig
86829e8672 Fixed some missing localization 2015-06-27 16:06:46 +01:00
Gig
aa76eeb6b0 Added CATEGORY_EMC to config 2015-06-27 15:59:50 +01:00
Gig
d1196d0a7c Removed Recipes button and moved to progress bar 2015-06-27 10:01:39 +01:00
modmuss50
6f08a56df2 Added some values for copper and tin, added support for ic2 machines and crafting 2015-06-27 09:03:09 +01:00
joflashstudios
10837c46ff Added a few template electrolyzer recipes 2015-06-27 03:28:16 -04:00
Gig
6353b9dc06 Fixed some small recipe Issues 2015-06-27 01:29:20 +01:00
modmuss50
8aaebfeb63 Added some useful eel commands, and attempt at fix for reloading every restart. 2015-06-26 21:46:47 +01:00
modmuss50
40ca57331c fixes #55 2015-06-26 21:28:16 +01:00
joflashstudios
9ae298eacc Merge remote-tracking branch 'origin/master' 2015-06-26 13:07:46 -04:00
joflashstudios
1e4e42a202 Added thousands separator to make EU in NEI more readable 2015-06-26 13:07:25 -04:00
Gig
b0a6a86a5b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-26 17:56:14 +01:00
Gig
6e74b9197b IndustrialElectrolyzer now uses fluids
IndustrialElectrolyzer now renders fluids in gui
IndustrialElectrolyzer recipe handler now renders fluids
2015-06-26 17:56:09 +01:00
joflashstudios
53b2e454ed Fixed another typo I missed 2015-06-26 12:40:36 -04:00
joflashstudios
7c7f7a252f Some spelling fixes, added call to addMachineRecipes 2015-06-26 12:39:14 -04:00
Gig
6cc1071961 made Dungeon loot easy to add 2015-06-26 17:22:58 +01:00
modmuss50
15c3608c6e Fixes #53, fixed some render things 2015-06-26 13:35:07 +01:00
modmuss50
5fc5aa1e05 Fix power flowing thorough covers 2015-06-26 08:25:51 +01:00
modmuss50
66ce8d3a47 fixed #52 2015-06-26 08:21:20 +01:00
modmuss50
0b3736f639 fixes #51 2015-06-26 08:17:02 +01:00
joflashstudios
c15302a789 Cleaned up and automated some recipe stuff
Correct recipes to and from storage blocks are now available. The old wrong ones still need to be removed (e.g. sapphires to chrome block.)
2015-06-26 02:09:45 -04:00
joflashstudios
f2667db9de Fixed pointlessly public functions 2015-06-25 23:18:22 -04:00
joflashstudios
92c5b5b64b More recipe re-organization 2015-06-25 23:02:35 -04:00
joflashstudios
b48dd6582a Moved non-IC2 compat recipes out of IC2 compat class.
All that is in RecipesIC2 now are modifications to IC2 recipes, or additional recipes in IC2 machines.
2015-06-25 22:56:02 -04:00
joflashstudios
8814c1b9d2 Made GenericRecipeHandler more generic 2015-06-25 22:43:40 -04:00
joflashstudios
338575d56d Added iron IBF recipes 2015-06-25 22:36:06 -04:00
joflashstudios
7c1aec7e9f Added some Blast Furnace recipes 2015-06-25 21:35:05 -04:00
Gig
805f02effb Moved Blast furnace heat value in gui 2015-06-26 01:31:47 +01:00
Gig
c11086243b Missing Multiblock message can now be localized 2015-06-26 01:28:18 +01:00
Gig
413feac35c Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-26 01:15:49 +01:00
Gig
759346f388 Added Missing Multiblock to gui's 2015-06-26 01:15:44 +01:00
joflashstudios
11d4345ee7 Renamed to ItemDustTiny for consistancy
Renamed to ItemDustsTiny
2015-06-25 20:04:08 -04:00
Gig
737d7e34a3 Scaled down the info in nei handlers
Scaled up the fluid renders for nei handlers
2015-06-26 00:44:40 +01:00
joflashstudios
a0a97a405b Fixes #50 2015-06-25 19:41:03 -04:00
joflashstudios
33b274ca68 Updated getByName functions
Made comparison case insensitive
2015-06-25 19:16:26 -04:00
joflashstudios
0f6747f703 Updated getByName functions
Added storage block functions
Fixed a bunch of getX() typeos
2015-06-25 18:41:29 -04:00
Gig
5c48dda843 Titanium get!!
Added basic recipes for Titanium
2015-06-25 20:43:54 +01:00
modmuss50
154e65082a Added heat to the BlastFurnace 2015-06-25 20:20:47 +01:00
Gig
ddb4b5cb20 Moved blast furnace recipes over to new crafter still needs to get heat 2015-06-25 20:17:14 +01:00
modmuss50
37467cab7e Some improvements to render speed of cables 2015-06-25 20:10:03 +01:00
modmuss50
7c56cd25f6 Fixed Cable power issues 2015-06-25 19:44:53 +01:00
Gig
1f8a9794bc Fixed wrong dusts being smelted 2015-06-25 19:21:16 +01:00
Gig
8da3e8323a Grinder now requires multiblock 2015-06-25 16:40:39 +01:00
Gig
7a4ac3e610 ImplosionCompressor now requires multiblock 2015-06-25 16:33:56 +01:00
Gig
17c8f4d253 Fixed grinder progress bar closes #45 2015-06-25 16:18:10 +01:00
modmuss50
f92f67232a some improvements to tick time 2015-06-25 08:28:29 +01:00
modmuss50
f9a99feee0 fixes #43 and fixes #48 2015-06-25 07:55:29 +01:00
Gig
7ba9cad072 increase ores hardness 2015-06-24 14:12:30 +01:00
modmuss50
b794c609d2 Fix Cable Sizes 2015-06-24 07:12:37 +01:00
Gig
54845b8777 Test fix for server craft 2015-06-24 01:15:19 +01:00
modmuss50
de8d1a8a51 Removed stupid Rock Crusher Recipe 2015-06-23 23:11:11 +01:00
modmuss50
10eb1eda45 Clean fix for #42 2015-06-23 19:39:39 +01:00
modmuss50
84fc33edab Added a way to get the fmp cables in survival, will make this better later 2015-06-23 13:23:56 +01:00
modmuss50
5fbe42c026 some tweaks to the values 2015-06-22 18:32:08 +01:00
modmuss50
74a9ace574 rewritten matter fab
Take 3 should be good :)
2015-06-22 17:10:06 +01:00
Gig
6d99b28e7d Fixed the IndustrialElectrolyzerRecipeHandler 2015-06-22 16:11:58 +01:00
modmuss50
e660463bae Some work no the mass fab 2015-06-22 11:32:30 +01:00
joflashstudios
a7209f7e79 Added elecrolyzer NEI handler 2015-06-22 00:40:05 -04:00
joflashstudios
dc49bb9b45 Changed accessability, added placeholder electrolyzer recipe function 2015-06-21 20:00:25 -04:00
modmuss50
43da219936 Some clean up of some code 2015-06-21 14:17:47 +01:00
joflashstudios
9e4151f5fa Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-20 21:01:02 -04:00
joflashstudios
ec19acf2f0 Added IndustrialElectrolyzerRecipe 2015-06-20 21:00:44 -04:00
Gig
49a359f178 blast furnace gui should still open even if there is no multiblock 2015-06-20 21:54:08 +01:00
Gig
5d9c273743 Massive cleanup on the fluids 2015-06-20 21:34:03 +01:00
Gig
c6bc7f6fb8 Little more work on pda lots more to do 2015-06-20 11:24:04 +01:00
Gig
95c57bccf0 small hud changes looks a littlie better 2015-06-20 10:30:52 +01:00
joflashstudios
4fb6f4aca6 Fixed some LESU things
EU/t and capacity are now config-driven. Note that while the "max-eu" updates when you remove LESU storage blocks, it's currently retaining the highest EU/t you get, so if you remove blocks, the GUI still says it has the same EU/t you had before you removed them. Also shortened EU display.
2015-06-19 22:31:56 -04:00
joflashstudios
238901323c Some hud tweaks 2015-06-19 20:03:31 -04:00
modmuss50
8058867eb1 Deprecated the item cells class, it now returns the ic2 version instead of the tr one for recipes 2015-06-19 19:01:38 +01:00
modmuss50
345fa8e4a0 Fixed average eu/tick out 2015-06-19 18:38:08 +01:00
modmuss50
d30c251b8f fixes #40 2015-06-19 18:13:05 +01:00
modmuss50
45783b55f1 Fixes #38 on new ic2's 2015-06-19 18:07:15 +01:00
Gig
3688c7d838 Convert to ints 2015-06-19 17:54:52 +01:00
Gig
eb37bf274a Chargehud displays ints and no doubles 2015-06-19 17:49:31 +01:00
Gig
52deb162ff Fixes closes #39 2015-06-19 00:56:07 +01:00
modmuss50
a38899184d Some work, need to fix somethings at a later date 2015-06-18 21:10:26 +01:00
Gig
45d0f36286 Removed some unneeded imports to avoid missing dependence crashs 2015-06-18 20:36:56 +01:00
modmuss50
9d16b13d6e initial work on making it work, now to fix the broken gui 2015-06-18 18:34:39 +01:00
modmuss50
da4d56ac0f Some small fixes 2015-06-17 17:33:57 +01:00
modmuss50
598badc375 A load of work on the system, seams a lot is broken. 2015-06-17 17:01:26 +01:00
modmuss50
d8e6e88797 updated some CofhLib Files trying to fix text rendering, still not working 2015-06-17 11:24:41 +01:00
modmuss50
74525d260a Some small changes to the gui code 2015-06-17 11:14:46 +01:00
modmuss50
90be01753b Added repackaged cofh lib to help with the IDSU gui 2015-06-17 08:35:45 +01:00
joflashstudios
54904b223f Fixed oredrops
Fixes #36
2015-06-17 00:27:44 -04:00
modmuss50
70fb58f704 work on the gui list 2015-06-16 13:38:46 +01:00
modmuss50
2bed98e6f0 Added basic test cases for the IDSU manager, it looks like it works :) 2015-06-15 21:18:12 +01:00
modmuss50
97e8492801 Fixed java 6 support 2015-06-15 20:19:21 +01:00
modmuss50
30ad6dd52f Cleaned up, fixed spelling issues 2015-06-15 20:12:02 +01:00
modmuss50
b0fdd92b8d Initial work on IDSU manager 2015-06-15 20:09:16 +01:00
joflashstudios
d5a1494784 A bit of hud code cleanup 2015-06-14 20:12:19 -04:00
joflashstudios
03e252ef84 Fixes #33 2015-06-14 20:09:29 -04:00
joflashstudios
2b17e7e949 Missed some AOBD lines 2015-06-14 18:03:32 -04:00
joflashstudios
9359022c83 Added fix for AOBD compatibility 2015-06-14 17:56:15 -04:00
Gig
98c8f43b84 Added keybinding to toggle if hud is shown 2015-06-14 20:53:05 +01:00
Gig
59d4199260 More hud changes 2015-06-14 20:04:14 +01:00
Gig
f5e0e4bd87 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 19:41:45 +01:00
Gig
8ca96b8f27 Small changes to hud 2015-06-14 19:41:41 +01:00
Tntrololol
4deab0c4ac Merge remote-tracking branch 'origin/master' 2015-06-14 13:35:03 -05:00
Tntrololol
083696280c Some GUI fixes 2015-06-14 13:34:52 -05:00
Gig
3b6cd66cb7 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 19:34:20 +01:00
Gig
1b20c3fcb0 Hud color changes depending on current charge 2015-06-14 19:34:14 +01:00
modmuss50
4ea5c0f8b0 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 19:11:42 +01:00
modmuss50
be296c69aa Fixed syncing items 2015-06-14 19:11:26 +01:00
Gig
22d018efb3 World gen tweeks 2015-06-14 18:31:49 +01:00
Gig
f5aecc07cc Fixed derpy textures 2015-06-14 18:29:27 +01:00
Gig
0b43eca49a Removed Gravity Chestplate not needed in this mod anymore 2015-06-14 17:11:18 +01:00
Gig
28dbcb8a16 Removed Debug Recipes 2015-06-14 17:04:57 +01:00
modmuss50
11a7b42689 polishing the lesu. 2015-06-14 16:54:49 +01:00
modmuss50
c9c664352c Finished the lesu 2015-06-14 16:42:03 +01:00
modmuss50
783765676b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 15:59:03 +01:00
modmuss50
2ded7e0121 Added lesu logic. updated fmp to allow extra utils to run 2015-06-14 15:58:49 +01:00
Gig
0ac115b0e1 Added config for ChargeHud 2015-06-14 13:45:41 +01:00
modmuss50
afdbe69d18 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 13:35:47 +01:00
modmuss50
51c91aaccb Added lesu storage block counting 2015-06-14 13:35:36 +01:00
Gig
b0b2f4e6eb Small changes to RockCutter 2015-06-14 12:56:08 +01:00
modmuss50
81f75abf22 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-14 12:35:41 +01:00
modmuss50
af9e9e535a Now stores eu when broken with a wrench. Added empty and full ones to creative tab. 2015-06-14 12:35:28 +01:00
Gig
e2ae947e2c More work on ChargeHud now shows current charge
Added Color enum from Talismans 2 will be used for hud soonTM
2015-06-14 12:34:47 +01:00
modmuss50
63fa58eb24 Added average eu change to the aesu. 2015-06-14 12:15:24 +01:00
modmuss50
755c64369a Fixed fluid syncing issues, fixed liquid item dropping when block broken 2015-06-14 11:58:56 +01:00
modmuss50
f5bd04db3c Fixes the layout of the aesu gui 2015-06-14 11:37:42 +01:00
Modmuss50
870958cd68 Merge pull request #32 from UniversalLP/master
Added destructopack gui
2015-06-14 10:48:03 +01:00
Tntrololol
1e657c9e04 Added Industrial Sawmill Recipes for Forestry logs 2015-06-13 18:31:46 -05:00
Universal
600293b0e8 Made destructopack work
Missed two files...
2015-06-14 01:21:03 +02:00
Universal
8a2119d5d2 Made destructopack work 2015-06-14 01:13:09 +02:00
Tntrololol
a9ea898cab Added Industrial Sawmill Recipes for Thaumcraft magical logs 2015-06-13 15:59:55 -05:00
Tntrololol
e3338cf40f Fixed existing Sawmill recipes not outputing empty cells 2015-06-13 14:56:15 -05:00
modmuss50
62b5f2f046 removed unused inport to fix crash 2015-06-13 07:47:24 +01:00
modmuss50
7308507a74 fixes #31 , Fixes crash without bop or natura installed, fixes npe with no plup item, adds basic fluid gui support to the nei handler, fixes build craft 6 not working 2015-06-13 07:45:12 +01:00
Tntrololol
fbde3bcaf0 Added Industrial Sawmill Recipes for Biomes O Plenty logs 2015-06-12 23:46:03 -05:00
Tntrololol
875ac18f0b Updated Ore Dictionary registration to use item/block helpers 2015-06-12 21:35:57 -05:00
Tntrololol
496d8c4ba2 Fixed Industrial Sawmill recipe constructor (fixes compiler error) 2015-06-12 21:30:35 -05:00
Tntrololol
a6fcd15082 Added item for saw dust 2015-06-12 18:49:32 -05:00
Tntrololol
2116e4eb39 Added Industrial Sawmill Recipes for Natura logs 2015-06-12 18:33:07 -05:00
modmuss50
6deb0b1d32 Improved the way we handle other mods 2015-06-12 18:40:08 +01:00
Gig
89f24a0c4d Start on charge hud 2015-06-11 23:23:14 +01:00
Tntrololol
d4a0fddaf9 Created new textures for AESU, IDSU, and LESU 2015-06-11 17:05:05 -05:00
modmuss50
0ea07a6a1a added way to not use ore dic 2015-06-11 21:35:05 +01:00
Tntrololol
df7199d113 Gave the Industrial Sawmill a front texture 2015-06-11 15:06:21 -05:00
Gig
5109c6b53b Fixed Nei Handler for the Grinder 2015-06-11 17:45:43 +01:00
Matthew
6829e27588 Update mcmod.info
http://i.imgur.com/QdTxHio.jpg
2015-06-11 09:49:17 -04:00
joflashstudios
41a516939f Removed broken test recipe for sawmill 2015-06-11 01:57:09 -04:00
Tntrololol
206f967d63 Updated the Industrial Sawmill to include a FluidTank and allow FluidStack input (someone make sure I did it right) 2015-06-10 23:48:15 -05:00
Tntrololol
45448c296f Added IC2 style GUI textures for AESU, IDSU, and LESU. 2015-06-10 23:24:39 -05:00
Tntrololol
0de7ae5d90 Renamed some tiles 2015-06-10 14:52:07 -05:00
modmuss50
871a6a6a9d Fixed as not outputting until hit with a wrench 2015-06-10 20:48:17 +01:00
modmuss50
65fe6dc405 Only show this when debuging 2015-06-10 18:36:07 +01:00
modmuss50
944ac7492e Fixed some issues with the AESU, Added gui text to it 2015-06-10 16:12:16 +01:00
modmuss50
81a5f3fc76 Fix output sides 2015-06-10 13:54:46 +01:00
modmuss50
9b1093c22c Added basic aesu controls, just need to finish the gui :) 2015-06-10 13:52:54 +01:00
modmuss50
92b95b9ff0 added some fixes, added documentation 2015-06-09 13:29:17 +01:00
modmuss50
6826cfe4be added unrest upgradeHandler 2015-06-09 11:24:15 +01:00
Tntrololol
776fd328c3 Added Chemical Reactor Recipes 2015-06-08 22:13:14 -05:00
Tntrololol
dd181dca2f Merge remote-tracking branch 'origin/master' 2015-06-08 21:01:55 -05:00
Tntrololol
0bd2b68d83 Added Implosion Compressor Recipes 2015-06-08 21:01:43 -05:00
Gig
ff61878bfb Added isided for PlateCuttingMachine 2015-06-08 23:38:15 +01:00
Gig
b4219f25ed Added Isided for MatterFabricator 2015-06-08 23:36:11 +01:00
Gig
d0ed6c5a47 Added ISided for Lathe 2015-06-08 23:34:12 +01:00
Gig
98329b2d01 Added Isided to IndustrialSawmill 2015-06-08 23:32:46 +01:00
Gig
e569d625f8 Added Isided for IndustrialElectrolyzer (CANT TEST) 2015-06-08 23:30:42 +01:00
Gig
1fa1806c15 Added Isided for ImplosionCompressor 2015-06-08 23:27:44 +01:00
Gig
99d237f26e Fixed Isided on Grinder 2015-06-08 23:27:31 +01:00
Gig
77c4ea4820 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-08 23:22:10 +01:00
Gig
c8da0db5f5 Added Isided for Grinder 2015-06-08 23:22:06 +01:00
Tntrololol
96b3278347 Merge remote-tracking branch 'origin/master' 2015-06-08 17:15:01 -05:00
Tntrololol
f5ca92313f Changed standard machine recipes to use item/block helpers 2015-06-08 17:14:43 -05:00
Gig
d95ccc6cc2 Added Isided to ChemicalReactor 2015-06-08 23:14:18 +01:00
Gig
4e9546431d Added Isided to Centrifuge
Fixed Isided on other machines
2015-06-08 23:11:48 +01:00
Gig
f005ba2ec7 Added Isided to Blast Furnace 2015-06-08 22:39:07 +01:00
Gig
99aa1f8811 Added Isided to Assembling machine 2015-06-08 22:32:19 +01:00
Gig
3c10c0f08f Added ISidedInv to alloy Smelter 2015-06-08 22:12:11 +01:00
Gig
4f800c8a83 Added basic tile for metalShelf 2015-06-08 20:51:08 +01:00
modmuss50
b56487b680 This should fix bc 6 compatibility
Can some one test please.
2015-06-08 18:26:22 +01:00
modmuss50
a94085229d Moved OreDrop
With a small bit of work we could make an api to get the config values,
then this could go in the api
2015-06-08 17:44:29 +01:00
modmuss50
2ef2ff997f updated to build craft 7.0.8 2015-06-08 17:41:41 +01:00
joflashstudios
02fce02d7b Said goodbye to RecipeHanderer
A bunch of ModRecipes fixes
2015-06-08 10:45:21 -04:00
joflashstudios
ffc4d5f9c3 Cleaned up some imports 2015-06-08 10:14:50 -04:00
joflashstudios
e2d0bd4a82 Removed the config object
It's not getting used. Those configs are static members.
2015-06-08 02:56:20 -04:00
joflashstudios
a2c0e4d091 Fixed some indentation I missed 2015-06-08 02:54:17 -04:00
joflashstudios
43204cb234 Some major recipe code cleanup
Varargs exists for a reason, you know ( ͠° ͟ʖ ͡°)
Also, changed the expensive recipes so that they actually behaved according to the configs.
2015-06-08 02:50:36 -04:00
joflashstudios
162859baa6 Some updates to mcmod.info 2015-06-08 02:20:58 -04:00
joflashstudios
86726d57c4 Fixed indention. IntelliJ can be obnoxious. 2015-06-08 01:45:49 -04:00
joflashstudios
f082fe5b2a Add the rest of the ores to the OreDrop API 2015-06-08 01:41:44 -04:00
joflashstudios
00d2f5f8fd OreDrop fixes
Fixes 2 issues.

1/100 block breaks, a non-fortune tool grants an extra item

Bug that breaks drops if the base count is > 1
2015-06-08 01:41:15 -04:00
joflashstudios
ace69fc5be Tweaked OreDrop constructor
baseChance is now exposed to the rest of the world as a double, since it was just an error waiting to happen when somebody enters the % chance as stack size or vice versa.
2015-06-08 01:06:56 -04:00
joflashstudios
999567e6df We no longer need to distinguish between primary and secondary, since we are now using [ArrayList<ItemStack> getDrops()].
We could possibly just get rid of the class altogether, but it keeps BlockOre's code significantly cleaner.
2015-06-08 00:46:51 -04:00
joflashstudios
8ca4950b02 Added ruby and sapphire ore drops. 2015-06-08 00:31:28 -04:00
Tntrololol
d330f28024 Changed IC2 specific machine recipes to use item/block helpers 2015-06-07 23:24:34 -05:00
joflashstudios
601812a10c Added OreDrop API 2015-06-07 23:55:58 -04:00
joflashstudios
c01ae43435 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 17:21:10 -04:00
joflashstudios
70f2d9f108 Added recipes for:
Tungsten grinding heads
Matterfacbricator
Shaped energy flow circuit recipe
Superconductor
Supercondensator
Iridium alloy ingot
Diamond saw blade
2015-06-07 17:20:49 -04:00
Gig
459672ac2c Removed a load of waila support 2015-06-07 21:01:29 +01:00
joflashstudios
d3c2929807 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 15:55:54 -04:00
joflashstudios
2f59ca1b84 Added computercube and lapotronic energy orb 2015-06-07 15:55:23 -04:00
Gig
f240604c4a Fixed Derp.... 2015-06-07 20:47:44 +01:00
Gig
a8962929cc Fixed small derp 2015-06-07 20:45:53 +01:00
Gig
b1cbec9e63 Added Grinder on textures 2015-06-07 20:41:06 +01:00
Gig
49c80a9f1b Changed texture for LapotronPack 2015-06-07 20:36:09 +01:00
Gig
c78191d9f1 Broken 2015-06-07 20:35:00 +01:00
Gig
958dbbd9c4 Round and round it goes 2015-06-07 20:23:49 +01:00
Gig
70cd363656 On Icons for a load of machines 2015-06-07 19:39:21 +01:00
modmuss50
a1ccb7202e Added timer to the recipes. 2015-06-07 19:37:56 +01:00
modmuss50
8187708e03 Fixed on/off textures when power runs out 2015-06-07 19:22:17 +01:00
modmuss50
439a877ace Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 19:11:26 +01:00
modmuss50
8122d25877 Added wrench rotation to the aesu. 2015-06-07 19:11:08 +01:00
Tntrololol
d9e219054e Merge remote-tracking branch 'origin/master' 2015-06-07 13:06:08 -05:00
Tntrololol
af65c885b1 Added proper textures to heat generator 2015-06-07 13:05:53 -05:00
modmuss50
23bf14b37d Clean the sawmill gui a bit, and remove debug code 2015-06-07 18:58:31 +01:00
modmuss50
c401f614d3 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 18:22:43 +01:00
modmuss50
950f556770 Fixed issue when not enough imports are present. 2015-06-07 18:22:31 +01:00
Gig
bf2054d0a7 Fixed Import 2015-06-07 18:17:39 +01:00
modmuss50
089f5500e6 removed unneeded debug code 2015-06-07 14:27:19 +01:00
modmuss50
3605fa7f66 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 14:21:25 +01:00
modmuss50
06c21d2668 this was the issue all along
This would be the easy fix to my last commit.
2015-06-07 11:11:07 +01:00
modmuss50
efba3f247d added IInventory to all machines 2015-06-07 09:38:12 +01:00
modmuss50
1ac6f592f8 Fixes #25 2015-06-07 09:31:58 +01:00
modmuss50
94803e88f3 attempt at fixing the item stack size issue 2015-06-07 09:21:37 +01:00
joflashstudios
92af5a1537 Fixed Digital Chest texture 2015-06-07 01:26:37 -04:00
joflashstudios
123c12ae45 Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers. 2015-06-07 01:02:45 -04:00
joflashstudios
26e71488dd Revert "Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers."
This reverts commit d9494c31fb.
2015-06-07 00:45:15 -04:00
joflashstudios
d9494c31fb Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers. 2015-06-07 00:41:20 -04:00
joflashstudios
9fa01eaee2 Added helpers for the rest of the item types 2015-06-07 00:36:37 -04:00
joflashstudios
b950105578 Created BlockOre helpers to make recipes more readable.
These works the same as the ItemParts helpers from e00ba942f8
2015-06-07 00:13:41 -04:00
joflashstudios
e00ba942f8 Created ItemParts helpers to make recipes more readable.
This makes recipes easier to both write and understand, because I don't have to wonder what ModItems.parts #8 is, I can just see "dataOrb."
2015-06-06 23:52:51 -04:00
joflashstudios
31bf279afe Added QuantumTank, QuantumChest, DigitalChest, and ComputerMonitor recipes 2015-06-06 23:39:48 -04:00
joflashstudios
7cfaac1f61 Added Digital Chest, Computer Monitor 2015-06-06 22:11:13 -04:00
Gig
65bd203791 All machines will drop Inventory after they Implement IInventory 2015-06-07 00:00:15 +01:00
Gig
03c1556935 Clean this b4 people kill me 2015-06-06 23:20:30 +01:00
modmuss50
c6dc2e2810 Clean up of code 2015-06-06 22:51:06 +01:00
joflashstudios
2ed801eeb2 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-06 17:36:49 -04:00
joflashstudios
202c562936 Adding fix for #19 to semifluid and thermal generators. 2015-06-06 17:36:45 -04:00
modmuss50
972efc4481 A commit, it might be the answer to everything 2015-06-06 21:59:54 +01:00
modmuss50
37258cb84c Removed vanilla multipart compact. (This is why I love modularisation) 2015-06-06 21:56:55 +01:00
modmuss50
b45711f3f1 A fix that works :) (I hope) 2015-06-06 21:53:24 +01:00
modmuss50
0bd8d3e42b fix import 2015-06-06 21:44:32 +01:00
modmuss50
4d76a3071d My mind is blown :D Not sure whats up 2015-06-06 21:41:41 +01:00
joflashstudios
ee798923f5 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-06 15:58:37 -04:00
joflashstudios
b01399f2b5 Fixed helium coolant cell textures. 2015-06-06 15:57:53 -04:00
Gig
3114dc9194 Machines now return machine blocks unless wrenched 2015-06-06 20:55:02 +01:00
joflashstudios
71c445d1ed Fixed tetrahedrite ore texture. This gets rid of the different texture per-side feature, because it's incompatible with the ore texture loader we're using. I don't think it's worth writing custom code just so tetrahedrite can have more than one texture. 2015-06-06 15:37:52 -04:00
joflashstudios
4c018dc7ad Added textures for all TechReborn fluids. 2015-06-06 15:34:54 -04:00
Gig
b423ffd1a5 Gem ores now return gems 2015-06-06 19:54:39 +01:00
modmuss50
9ee06aed89 Fix saying with gas turbine 2015-06-06 09:07:23 +01:00
modmuss50
6f80bf7e72 Initial port of fluid gui code to nei. Needs some rearraning 2015-06-06 09:04:56 +01:00
modmuss50
56619a0ac4 Fixed grinder not syncing, started work on the nei handler for it, will add the fluid for it in a bit 2015-06-06 08:01:24 +01:00
Modmuss50
28d618632e Merge pull request #23 from joflashstudios/master
Added gas turbine. Still missing recipe and some config elements.
2015-06-06 07:53:24 +01:00
modmuss50
379b6a96da finished fixing #19 2015-06-06 07:52:00 +01:00
modmuss50
8a1f0a18cd Fixed crash when saving not, fixes saving items, fixes #19 2015-06-06 07:32:20 +01:00
joflashstudios
48dd12aa5a Added gas turbine. Still missing recipe and some config elements. 2015-06-05 16:24:52 -04:00
joflashstudios
0a965d0b5e Added support for biofuel, bioethanol, and fuel to the semifluid generator, using the eu values from http://ftbwiki.org/Semifluid_Generator_%28IndustrialCraft_2%29 2015-06-05 10:17:58 -04:00
joflashstudios
55521b22b1 Revert "Added biofuel, bioethanol, and fuel support to semifluid generator."
This reverts commit eb1bd68a95.
2015-06-05 10:16:05 -04:00
joflashstudios
eb1bd68a95 Added biofuel, bioethanol, and fuel support to semifluid generator. 2015-06-05 10:05:55 -04:00
joflashstudios
81273e33ad Added Semifluid generator. Suffers from issue #19 as well. 2015-06-04 23:34:04 -04:00
modmuss50
0749385e49 About to give up. Here is what ive got. 2015-06-01 21:29:39 +01:00
modmuss50
34530fa6ca Improve part server peformance 2015-06-01 21:08:28 +01:00
modmuss50
31574f2cdd Some fixes, some breakages 2015-05-31 18:54:58 +01:00
modmuss50
0419c0dfa6 Fixed progress bar outputs 2015-05-31 11:10:43 +01:00
modmuss50
1e656b26e7 Now sync to the client side tile, not the container. 2015-05-31 10:45:08 +01:00
Gig
17ed2d163d Ores can now be silk tuched
Started on ores returning ItemGems
TODO finish
2015-05-31 01:59:43 +01:00
modmuss50
90df1fe398 only adds emc values for recipes with one output 2015-05-30 13:49:48 +01:00
modmuss50
9075692951 Added basic ee3 support for all machines, will not work right when it has two outputs 2015-05-30 11:47:01 +01:00
modmuss50
309321dbdc Added powerMultiplier 2015-05-30 11:31:00 +01:00
modmuss50
6185bcd694 added speedMultiplier to the crafter 2015-05-30 11:27:15 +01:00
modmuss50
edabf79b1e Moved all the machines to the new way of handling the packets 2015-05-30 11:14:00 +01:00
modmuss50
0f321e2426 Fixed isactive 2015-05-30 08:53:39 +01:00
Gig
cb541661ad Realigned Nei handler to implosion compressor slots 2015-05-30 02:45:16 +01:00
Gig
83d6613f94 End ore will now only generate in the End 2015-05-30 02:42:43 +01:00
modmuss50
18eed2bf0a fixes #17 2015-05-29 21:54:56 +01:00
modmuss50
7dced713ba Some small changes 2015-05-29 17:13:03 +01:00
modmuss50
c5e73c6fc3 Moved over to the vanilla packet system. 2015-05-29 17:00:17 +01:00
modmuss50
3b56d7c1e1 should fix the texture no updating, not sure why this broke 2015-05-28 09:54:08 +01:00
modmuss50
cd00ebc4fe Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-27 14:45:06 +01:00
modmuss50
cf8628cd2a Fixed inputs not being used 2015-05-27 14:44:48 +01:00
Yves
8c2d626729 Update fr_FR.lang
waitting for testing your mod after this last (but not least) update.
2015-05-27 13:55:25 +02:00
modmuss50
046b7d7375 added it for all the machines, can you test? Im about to give up on it ;( 2015-05-27 12:28:13 +01:00
modmuss50
bed71bd732 This should be the end of it, was so close to giving up 2015-05-27 12:22:14 +01:00
modmuss50
8055546675 Trying to fix the sync issue 2015-05-27 12:19:11 +01:00
Yves
64a82a11b4 Update fr_FR.lang
this is the turn off all small ans tiny dust, ingot and nugget, ore crushed, rod and plate
2015-05-27 12:09:01 +02:00
Tntrololol
4ce6b21d03 Fixed grinder allowing any type of fluid into its tank 2015-05-26 23:28:12 -05:00
Tntrololol
6ddc05e998 Added/fixed some grinder recipes 2015-05-26 15:13:13 -05:00
modmuss50
d6a1c9724b Fixed disappearing items 2015-05-26 17:29:01 +01:00
Yves
54677cad5e Create fr_FR.lang 2015-05-26 14:54:49 +02:00
Tntrololol
e62ba4d440 Fixed crash with cross mod grinder recipes 2015-05-25 23:26:54 -05:00
Tntrololol
a5691aff9a Fix recipe conflict with Mekanism 2015-05-25 22:21:12 -05:00
Tntrololol
10b13d9adc Added Industrial Grinder Recipes 2015-05-25 21:17:59 -05:00
Tntrololol
37ba159fa1 Fixed storage block ore dictionary registrations 2015-05-25 12:37:51 -05:00
Tntrololol
ade8f68acb Added Metal Former Recipes 2015-05-25 12:10:20 -05:00
Tntrololol
fceb417fe2 Added Industrial Centrifuge Recipes 2015-05-25 00:20:59 -05:00
Tntrololol
0bb98b1781 Enabled Grinder to take an extra input in place of fluidstack 2015-05-24 13:51:41 -05:00
modmuss50
2d17902d03 Allow any input or output to be null, includes a fix for the grinder fluid as well 2015-05-23 13:54:12 +01:00
modmuss50
46ee2fc71d Initial fix to allow null itemstacks 2015-05-23 13:47:25 +01:00
Tntrololol
56e41efd6b Merge remote-tracking branch 'origin/master' 2015-05-22 17:37:26 -05:00
Tntrololol
7ad96faa21 Added new storage blocks and textures 2015-05-22 17:37:10 -05:00
modmuss50
e4c5b1a0da Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-22 21:15:29 +01:00
modmuss50
0298621cb9 More work on the syncing issues, should be all fixed :) 2015-05-22 21:15:19 +01:00
Tntrololol
e9b1280a13 Added 5 additional types of machine hulls and their respective textures 2015-05-22 15:02:02 -05:00
modmuss50
e930ea2a04 Added a central way of limiting the syncs.
Tiles auto sync every 30 seconds
they have a max so they can only sync 2 times a second
2015-05-22 08:22:16 +01:00
Tntrololol
cdf8f3e0a3 Added GUI elements to the Industrial Grinder 2015-05-21 18:04:34 -05:00
modmuss50
74e16510aa added isActive to the crafter 2015-05-21 21:27:16 +01:00
modmuss50
9eb7735c10 Added comments to the crafter to help people understand it 2015-05-21 07:56:01 +01:00
Gig
7b1b131b23 Little things 2015-05-21 00:42:44 +01:00
Gig
1446237236 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-20 23:35:18 +01:00
Gig
4ffa445b9b Fixed Lathe returning on texture all the time 2015-05-20 23:35:04 +01:00
Tntrololol
2278e2ab3e Added GUI progress bar to the Chemical Reactor 2015-05-20 17:34:41 -05:00
Tntrololol
f32c81c780 Merge remote-tracking branch 'origin/master' 2015-05-20 16:44:06 -05:00
Tntrololol
4bd43b861c Added GUI progress bar to the Industrial Centrifuge 2015-05-20 16:43:46 -05:00
Gig
105c83b288 Fixed Conflicting Tiles Closes issue #7 2015-05-20 17:00:58 +01:00
Gig
1f93e6a90e Fixed centrifuge returning alloy smelter 2015-05-19 23:07:20 +01:00
Gig
cfaabab37a Moved recipe handlers to Api 2015-05-19 23:06:52 +01:00
Gig
1f9600b33c Organized imports
Changed centrifuge to new recipe system
2015-05-19 23:00:36 +01:00
Tntrololol
6de2cc351a Added plate cutting machine recipes 2015-05-18 18:05:49 -05:00
Tntrololol
942c41fe14 Added electric lathe recipes 2015-05-18 17:12:11 -05:00
Tntrololol
701b6553b6 Merge remote-tracking branch 'origin/master' 2015-05-17 19:57:34 -05:00
Tntrololol
2007161a16 Added remaining assembling machine recipes 2015-05-17 19:56:52 -05:00
Gig
20a9cabf93 Little clean and format change 2015-05-17 22:58:53 +01:00
Gig
ce4312a578 Upgrade slots for more machines 2015-05-17 19:45:12 +01:00
Gig
ca98541d70 Start on hammer 2015-05-17 02:16:40 +01:00
Gig
cfc71d48b2 Added machine block for stand alone recipes 2015-05-17 01:37:03 +01:00
Tntrololol
3b5f80bf77 Merge remote-tracking branch 'origin/master' 2015-05-16 18:52:15 -05:00
Tntrololol
71e20d4dac Added some assembing machine recipes (not done yet) 2015-05-16 18:52:05 -05:00
Gig
0970604d5b Added waila support to more machine 2015-05-17 00:44:46 +01:00
Gig
9bc9da2fad Fixed ItemIcons on machines 2015-05-16 23:14:17 +01:00
Gig
2163092237 added On textures to a load of machines 2015-05-16 22:50:11 +01:00
modmuss50
3a89b0446c Added on texture to implosion compressor 2015-05-16 22:30:45 +01:00
modmuss50
1726d4c7a3 Fixed drainContainers not checking to see if it can fill 2015-05-16 21:55:27 +01:00
modmuss50
44a21fd13d Fixed some things 2015-05-16 21:30:20 +01:00
modmuss50
d68c63a40d Added fluid crafting, updated buildcraft 2015-05-16 20:30:07 +01:00
modmuss50
fd2f5d193a added onCraft, and canCraft 2015-05-16 19:40:39 +01:00
modmuss50
9b654eb1de Fixed stack size 2015-05-16 19:26:26 +01:00
modmuss50
1b308c56d6 Revert "Merge remote-tracking branch 'origin/loadingScreen'"
This reverts commit 5e20dc8156, reversing
changes made to 3e5fc0bbec.
2015-05-16 17:45:42 +01:00
modmuss50
5e20dc8156 Merge remote-tracking branch 'origin/loadingScreen'
Conflicts:
	src/main/java/techreborn/Core.java
2015-05-16 17:44:08 +01:00
modmuss50
3e5fc0bbec Massive network performance inprovement. 2015-05-16 17:33:50 +01:00
modmuss50
d32b39d8c6 Machines no longer require an input in the set slot 2015-05-16 17:23:39 +01:00
modmuss50
f7124cb7e6 fixed syncing things, and bug with last commit 2015-05-16 16:59:36 +01:00
modmuss50
6bd2818e74 fixed input stack size 2015-05-16 16:55:54 +01:00
Gig
f9074e5b37 Added battery and upgrade slots to chemical reactor 2015-05-15 17:46:03 +01:00
Gig
83259b0615 Fixed Chemical Reactor gui name 2015-05-15 17:37:33 +01:00
Gig
44abbfd79f Added missing uurecipes 2015-05-15 17:29:12 +01:00
Gig
fc11db09cc Added bucket textures to items 2015-05-15 17:05:18 +01:00
Gig
2b652f0502 I should remember when I update forge to run gradlew eclipse 2015-05-15 16:52:16 +01:00
Gig
ceeda641a6 Commented out all doesOreNameExist recipes 2015-05-15 16:45:27 +01:00
Gig
f1fd0af052 Now checks for ee3 2015-05-15 16:27:40 +01:00
Tntrololol
3c0bd5a54f Added remaining alloy smelter recipes 2015-05-14 22:19:52 -05:00
Tntrololol
158fdd338a Fixed custom macerator recipes showing up as fire in NEI if ores were not present. 2015-05-14 16:03:19 -05:00
Tntrololol
24180fd5b1 Merge remote-tracking branch 'origin/master' 2015-05-13 17:32:03 -05:00
Tntrololol
fdec643bbb Added bucket textures 2015-05-13 17:31:48 -05:00
Gig
55a3acff14 Little things for later 2015-05-13 22:22:14 +01:00
Tntrololol
5a57dc5817 Merge remote-tracking branch 'origin/master' 2015-05-12 13:26:35 -05:00
Tntrololol
65dd53c6ec Added machine GUI progress bars 2015-05-12 13:26:23 -05:00
Gig
bf49bd2136 Added upgrade slots to AssemblingMachine 2015-05-12 16:05:15 +01:00
Gig
13957467a1 Added battery slot and upgrade slots to alloy smelter 2015-05-12 15:58:20 +01:00
Gig
a23243cd02 Added ChemicalReactor 2015-05-12 00:17:17 +01:00
Gig
1de5de9cec Quick fix to platecuttingmachine 2015-05-12 00:01:33 +01:00
Gig
f84d9edc06 Finish plate cutting machine 2015-05-11 23:50:49 +01:00
Gig
2ab94e6030 Fixed Lathe recipe handler 2015-05-11 23:44:26 +01:00
Tntrololol
c9c5adf4ab Experimenting with GUI progress bars 2015-05-11 17:29:37 -05:00
Tntrololol
9f25a41a3d Merge remote-tracking branch 'origin/master' 2015-05-11 17:26:34 -05:00
Tntrololol
0818405215 Temporarily removed world.isRemote() check to fix crafter sync issue. 2015-05-11 17:26:26 -05:00
Gig
0dde18f7e0 getting things ready for achievements 2015-05-11 23:00:29 +01:00
Gig
1bddb1747f Fix for the ticktime 2015-05-11 22:08:32 +01:00
Tntrololol
f3d346f6d1 Added fuel rod textures 2015-05-11 16:07:02 -05:00
Tntrololol
6a157f880e Merge remote-tracking branch 'origin/master' 2015-05-11 15:59:39 -05:00
Tntrololol
438541dfa4 Fixed missing textures and localizations 2015-05-11 15:59:24 -05:00
Gig
cf1074d637 Small tweeks 2015-05-11 21:53:47 +01:00
Gig
988747e98a Fixed plate cutting machine not storing inv to nbt 2015-05-11 18:04:28 +01:00
Gig
a8a46352c8 Added Industrial Sawmill pokes @modmuss50 to look at the nei handler crash issue bet I did it wrong 2015-05-11 17:04:27 +01:00
Gig
3fe5605de3 quick fix 2015-05-11 15:49:58 +01:00
Gig
fa2ebfa639 Added ConfigChangedEvent 2015-05-10 22:20:20 +01:00
modmuss50
f0fa0c0cdc Fixed Grinder crash on place 2015-05-10 21:45:43 +01:00
modmuss50
6648868944 Fixed crash when placing matter fab 2015-05-10 21:40:24 +01:00
Tntrololol
51071be80c Merge remote-tracking branch 'origin/master' 2015-05-10 15:39:27 -05:00
Tntrololol
792ab032ba Fixed/Updated GUIs 2015-05-10 15:39:19 -05:00
modmuss50
03cd665add Nei Handlers now show all ores 2015-05-10 21:03:48 +01:00
Gig
07be177c6c Changes to aesu 2015-05-10 21:02:57 +01:00
modmuss50
9ffce3b355 Made some things public 2015-05-10 20:51:57 +01:00
Tntrololol
6353f02541 Reformat 2015-05-10 13:11:46 -05:00
Gig
1db1c02077 Added config to heatgen 2015-05-10 19:08:02 +01:00
Gig
0011125a2a Changed alloysmelter gui texture to new 2015-05-10 19:04:30 +01:00
Gig
e784681b56 Added gui/container to alloy furnace 2015-05-10 19:00:58 +01:00
modmuss50
88bb4db40f Testing of the ores in nei 2015-05-10 18:47:08 +01:00
Gig
808a3056a2 Test seems to render fine and look fine can undo later 2015-05-10 17:37:39 +01:00
Gig
8c5afc7b5e Fixed fluids not rendering in tanks (dont no why that worked but it did ) 2015-05-10 17:36:09 +01:00
Gig
0de33330e3 Fixed machine opening gui's while being wrenched now players must be sneaking to wrench machine 2015-05-10 17:06:08 +01:00
Gig
744a694142 Fixed returning wrong tile 2015-05-10 16:46:22 +01:00
Gig
ee0844bd0c Added HeatGenerator 2015-05-10 16:42:01 +01:00
Tntrololol
350580d76e Merge remote-tracking branch 'origin/master' 2015-05-09 18:42:25 -05:00
Tntrololol
60ce6187f1 Added another massive amount of localizations 2015-05-09 18:42:11 -05:00
Gig
50c2599305 Littlie more work on AESU 2015-05-09 20:47:05 +01:00
modmuss50
4d68b34143 Nei now shows correct stack size, crafting system now uses correct stack amount, fixed syncing issues. 2015-05-09 20:29:26 +01:00
Gig
3d92772004 Basic work on Aesu 2015-05-09 20:19:40 +01:00
Gig
e3bd172b96 Added gui and container for industrialelectrolyzer 2015-05-09 19:13:43 +01:00
Gig
266c547520 Small fix's to multiple things 2015-05-09 18:51:31 +01:00
Gig
f326bb8352 Fixed dragoneggsiphoner crash on server 2015-05-09 18:31:58 +01:00
Gig
d3d1bb8060 Finished on buckets 2015-05-09 17:52:37 +01:00
Gig
f6ff497405 Fluid buckets 2015-05-09 16:56:10 +01:00
Gig
7e8b236558 Added all the fluids 2015-05-09 16:11:48 +01:00
Gig
dc7e65a171 added buckets for other fluids 2015-05-09 14:51:18 +01:00
modmuss50
d6bd8b944f Clean up of testing code 2015-05-09 13:51:32 +01:00
modmuss50
c37858de79 Added command to reload oreDicRecipes 2015-05-09 13:42:47 +01:00
modmuss50
333ba855fe Some unfished work on doing the ore dic recipes in a better way 2015-05-09 09:03:10 +01:00
Tntrololol
48280690f5 Fixed a bunch of localizations 2015-05-08 23:59:10 -05:00
Tntrololol
8b0a1eb894 Merge remote-tracking branch 'origin/master' 2015-05-08 21:37:45 -05:00
Tntrololol
b5b2ea64fb Removed item text color as it is used only to denote rare items. 2015-05-08 21:37:38 -05:00
Gig
55656c13a5 More fluid stuff 2015-05-09 02:15:38 +01:00
Gig
1ae5a20517 More fluid stuff lot more TODO 2015-05-09 00:36:55 +01:00
Gig
77634fafd3 Start on fluid system 2015-05-08 23:53:58 +01:00
Gig
74e31f017b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-08 23:02:40 +01:00
Gig
b9d6b356c2 Most of the work done on dieselgenerator 2015-05-08 23:02:35 +01:00
Tntrololol
77dd80d047 Added fluid and gas textures 2015-05-08 16:52:27 -05:00
Tntrololol
a4bf97beac Merge remote-tracking branch 'origin/master' 2015-05-08 16:44:16 -05:00
Tntrololol
c3d38693bd Added Thermal Centrifuge recipes 2015-05-08 16:44:00 -05:00
Gig
ed99503fb2 Switched to the new rollingmachine gui 2015-05-08 22:33:06 +01:00
Gig
c6405da0dd Little clean up 2015-05-08 22:28:37 +01:00
Gig
5511a65507 Somthing is having issues I blame @Mj11jM ;) 2015-05-08 22:06:15 +01:00
Gig
4f333c70ae NEIhandlers for alloysmelter and assemblingmachine 2015-05-08 21:34:59 +01:00
modmuss50
7f7beaa4e1 added this file? Whats up with you git? 2015-05-08 21:23:32 +01:00
modmuss50
c6d9f302c3 Fixed ore dic, and some work on multi blocks 2015-05-08 21:23:04 +01:00
modmuss50
446f94770d Added untested OreDictionary support 2015-05-08 21:07:59 +01:00
modmuss50
0bf7af8a84 Added saving crafting time to nbt 2015-05-08 20:43:28 +01:00
modmuss50
ed249fdf75 It works :) 2015-05-08 20:39:14 +01:00
modmuss50
7315e23864 Some code, it does not work 2015-05-08 20:29:13 +01:00
modmuss50
d27993ba5f Fixed cables not connecting to our tiles 2015-05-08 19:42:52 +01:00
modmuss50
d6ddaa002a some changes, will have a better look at this later 2015-05-08 19:03:09 +01:00
modmuss50
86c3e99666 It crafts to a point 2015-05-08 18:42:15 +01:00
Gig
752751319a Added Dragoneggsiphoner power 2015-05-08 18:19:03 +01:00
Tntrololol
6a78464668 More recipe stuff 2015-05-08 00:12:25 -05:00
Gig
b7ae806987 Block clean up 2015-05-08 00:39:17 +01:00
Gig
4e551abb8f Fixed platecuttingmachine gui name 2015-05-08 00:31:21 +01:00
Gig
67e97707ff Added platecuttingmachine 2015-05-08 00:30:59 +01:00
Gig
3ab786b3aa Fixed derp 2015-05-08 00:23:15 +01:00
Gig
aaee829f3b Added recipe buttons 2015-05-08 00:20:13 +01:00
Gig
2157fe1cb4 Added Lathe 2015-05-08 00:15:04 +01:00
Gig
c6e3dfaf82 Added tile/recipehandler/gui for Assembling Machine 2015-05-07 23:39:26 +01:00
Tntrololol
111cd541b5 Added missing galena ore items 2015-05-07 17:29:01 -05:00
Tntrololol
87dcd49174 Swapped Tin and Copper ore for Tetrahedrite and Cassiterite 2015-05-07 17:18:11 -05:00
Gig
e01058fca6 Changed the AlloySmelter recipe handler to new system 2015-05-07 23:11:34 +01:00
Modmuss50
f075d6391c Some more work on the crafting system, almost done it.
It was a lot easier that I thought it would be
2015-05-07 21:12:07 +01:00
modmuss50
12bea10af6 More work on the recipe system. 2015-05-07 20:38:11 +01:00
modmuss50
4d66bb9e9d Started working on the recipe system 2015-05-07 20:16:19 +01:00
Tntrololol
85e7503aa6 Merge remote-tracking branch 'origin/master' 2015-05-07 12:40:09 -05:00
Tntrololol
4f0942f215 Added a ton of IC2 crafting recipes 2015-05-07 12:39:47 -05:00
Gig
579558827b Added alloy smelter recipes to API 2015-05-07 17:04:07 +01:00
Gig
049afe676d Added recipe handler for alloy smelter 2015-05-07 17:00:34 +01:00
Tntrololol
e8fc6d5a07 Fixed ore dict registration and missing items 2015-05-05 19:50:34 -05:00
Tntrololol
f8cec1f21c fixed silver and lead ingot texture files 2015-05-04 22:48:43 -05:00
Tntrololol
01f0edd5d0 added missing tin plate icon 2015-05-04 22:45:15 -05:00
Tntrololol
558aef45e8 added IC2 ingots for standalone capability 2015-05-04 22:37:59 -05:00
Tntrololol
9232de5eb6 fixed file name 2015-05-04 22:23:39 -05:00
Tntrololol
47c4a1cf59 test 2015-05-04 22:22:36 -05:00
Tntrololol
1685410a35 Modified nugget names 2015-05-04 20:00:22 -05:00
Tntrololol
8b106ecbcd Changed icon directory 2015-05-04 19:45:24 -05:00
Tntrololol
fc7f25f699 Added names for purified crushed ores 2015-05-04 19:30:45 -05:00
Tntrololol
57780d23ed Added names for crushed ores 2015-05-04 19:24:47 -05:00
Tntrololol
6c4b87e07a Changed "aluminium" to "aluminum" to fix missing icon 2015-05-04 19:16:15 -05:00
Tntrololol
32765a4343 Updated plate names 2015-05-04 18:30:13 -05:00
Tntrololol
a66834cf88 Fixed copy paste error
I should really download eclipse...
2015-05-04 18:15:30 -05:00
Tntrololol
e5efe4f28a Fixed capitalization and icon directory string 2015-05-04 18:06:37 -05:00
Tntrololol
ef0afe7269 Fixed spelling mistake 2015-05-04 18:03:56 -05:00
Tntrololol
e59e954c55 Added metal rods 2015-05-04 17:58:06 -05:00
Gig
6495498bfb Fixed I hope 2015-05-04 22:05:23 +01:00
Gig
6b55d2e6a3 Broken build 2015-05-04 22:04:51 +01:00
Gig
1d0166b09f textures!!!! 2015-05-04 21:55:08 +01:00
Gig
f4a717c0ea All the items 2015-05-04 21:52:08 +01:00
Gig
617a33aea3 More machines 2015-05-04 21:26:51 +01:00
Gig
88080bccb9 Fixed textures for casing 2015-05-04 21:02:39 +01:00
Tntrololol
e780191616 More syntax errors... 2015-05-04 13:59:19 -05:00
Tntrololol
5378cd2134 Added various missing parts and reactor components 2015-05-04 13:57:15 -05:00
Tntrololol
a303ddad62 Fixed yellow garnet misspelling. 2015-05-04 13:31:31 -05:00
modmuss50
37b5aa73ba Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-04 19:07:50 +01:00
modmuss50
7f52e4f5e0 Fixed incorrect textures 2015-05-04 19:07:22 +01:00
Gig
465519cbd0 Added things 2015-05-04 19:06:42 +01:00
Gig
6ad1c8bdea Added aesu 2015-05-04 19:01:03 +01:00
modmuss50
7257da06e9 Added a massive amount of textures from @Tntrololol 2015-05-04 18:40:45 +01:00
modmuss50
2901466288 Started work on the multiBlock 2015-05-04 08:44:44 +01:00
modmuss50
77fb5949b9 Fixed compile errors 2015-05-04 08:02:01 +01:00
Tntrololol
9aff74fddc Missed a few 2015-05-03 23:37:20 -05:00
Tntrololol
77f761f1a6 Missed one 2015-05-03 23:36:55 -05:00
Tntrololol
6884f4ff1c Added missing ingots and fixed capitalization
Added ingots for antimony, battery alloy, red alloy, blue alloy, cadmium, cupronickel, indium, kanthal, lodestone, magnalium, nichrome, and tellurium.
2015-05-03 23:35:13 -05:00
Tntrololol
46a10b8cc7 Replaced olivine with peridot 2015-05-03 23:28:28 -05:00
Tntrololol
859ebc047e Fixed copy paste mistake
Sorry, currently not using an IDE.
2015-05-03 23:27:02 -05:00
Tntrololol
220febc0c5 Added missing small dusts and fixed capitalization
Added small dusts for antimony, biotite, cadmium, cupronickel, dark iron, glowstone, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, "redstone", silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
2015-05-03 23:25:23 -05:00
Tntrololol
636528bddc Added missing dusts and fixed capitalization
Added dusts for antimony, biotite, cadmium, cupronickel, dark iron, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
2015-05-03 23:17:09 -05:00
Tntrololol
982ec40192 Added tritium cell 2015-05-03 22:54:38 -05:00
Gig
d6b38f238e test fix for no textures on ingots 2015-05-04 00:18:35 +01:00
Gig
786d609d86 Fixed rockcutter breaking 2015-05-03 23:53:33 +01:00
Gig
6143f990fe Added IDSU 2015-05-03 23:49:30 +01:00
Gig
78afb4b57f Added platecuttingmachine 2015-05-03 23:37:30 +01:00
Gig
a732052f49 Added lathe 2015-05-03 23:34:49 +01:00
Gig
d9cf998d16 Added chemicalreactor 2015-05-03 23:30:44 +01:00
Gig
77f801f1a9 Added alloyfurnace 2015-05-03 23:25:16 +01:00
Gig
f0d0d2738e Added semifluidgenerator 2015-05-03 23:13:45 +01:00
Gig
afc750993c Added magicrnergyabsorber 2015-05-03 23:09:13 +01:00
Gig
7e8ab75b3e Changed more texture stuff 2015-05-03 22:59:49 +01:00
Gig
20dd587795 Added industrialelectrolyzer 2015-05-03 22:58:11 +01:00
Gig
8c7702c9dc Added DieselGenerator
more texture stuff
2015-05-03 22:54:06 +01:00
Gig
16cdb106c7 0 not 6 2015-05-03 22:43:27 +01:00
Gig
a386a35ead Fixed bottom textures 2015-05-03 22:27:19 +01:00
Gig
dec2c68e86 More texture changes 2015-05-03 22:15:39 +01:00
Gig
8910f9f9db Added textures
Added Dragoneggsiphoner
2015-05-03 21:48:10 +01:00
Gig
ab41f1b866 Added highlyadvancedmachineblock
some texture stuffs
2015-05-03 18:00:09 +01:00
Gig
e2c1f1307b Fixed something I broke 2015-05-03 17:33:27 +01:00
Gig
437318ece9 Changed texture stuffs 2015-05-03 17:22:39 +01:00
Gig
13b4d73e5a Little cleaner 2015-05-03 15:53:42 +01:00
Gig
ce1ff273c2 Textures for other ores 2015-05-03 15:39:15 +01:00
Gig
7914f530d2 More Configs 2015-05-03 15:24:35 +01:00
Gig
c9eb3b8a02 Configs 2015-05-03 15:05:12 +01:00
Gig
3e9e8a9f92 Added all uu recipes 2015-05-03 14:57:06 +01:00
modmuss50
4ae6522b34 Now uses the ic2 icons, they seams to be a bit off, will check them later 2015-05-03 14:46:17 +01:00
modmuss50
2ae61a7625 added the button to the centrifuge 2015-05-03 14:34:41 +01:00
modmuss50
39492fadbd Added button for recipes, fixed syncing with tanks 2015-05-03 14:31:19 +01:00
Gig
26b60d2896 Removed OLD textures
Added texture for uu
Added 1st uu recipe
Added configs
2015-05-03 13:49:28 +01:00
modmuss50
18c2ec19cf Attempted to fix sync issues 2015-05-03 08:16:59 +01:00
modmuss50
fc82d9aa56 Fixed spelling 2015-05-02 14:55:11 +01:00
modmuss50
bd59b48d02 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-01 20:07:47 +01:00
modmuss50
5e8f8978ee fixed compile again 2015-05-01 20:07:37 +01:00
Gig
16ab2cfa06 Added new recipe to buildcraft quarry 2015-05-01 20:05:34 +01:00
modmuss50
68c3437316 it compiles now :) 2015-05-01 20:04:31 +01:00
modmuss50
2616894527 Some small tweaks to the blast furnace, not tested 2015-05-01 19:50:31 +01:00
modmuss50
4409aec56a Added nei handler 2015-04-29 16:02:03 +01:00
Gig
8dda3c5ef5 Doing stuff and things 2015-04-29 13:34:08 +01:00
Gig
fc2265d0eb A few little things added to chunk loader 2015-04-29 13:08:07 +01:00
Gig
1826927149 Added gui and buttons to Chunkloader 2015-04-28 21:41:10 +01:00
modmuss50
fed4ea8bd7 Allows the recipes to be made backwards 2015-04-28 21:27:23 +01:00
modmuss50
ff866d9352 Fixed part crash and got the blast furnace to work! 2015-04-28 21:24:52 +01:00
Gig
92cccee9e9 Basic gui and container 2015-04-28 21:09:38 +01:00
modmuss50
0c514596a1 Added untested recipe code 2015-04-28 21:04:31 +01:00
Gig
e67b55eaff Basic block and tile for Industrial Chunkloader 2015-04-28 20:56:50 +01:00
Gig
1a2c0d483f Switch the output slots to SlotOutput instead of slot on new machines 2015-04-28 20:44:11 +01:00
Gig
72471b9dae Added gui texture for the Icompressor
Added container for Icompressor
2015-04-28 20:42:33 +01:00
modmuss50
b99cac1a1c Server now starts 2015-04-28 20:38:13 +01:00
Gig
fbbe621074 Need to get a gui texture for this :D 2015-04-28 20:29:27 +01:00
Gig
71d4a20d02 Finished container on Grinder 2015-04-28 20:21:29 +01:00
modmuss50
72ec08f069 Started work on the Blast furnace 2015-04-28 18:23:48 +01:00
Gig
1238f2d5a6 Started on Grinder will finish when I get back 2015-04-28 18:05:47 +01:00
Gig
7c1e72076b Added gui calls to all new machines
Added new gui to matter fab
Added container and slots to matter fab
2015-04-28 17:58:01 +01:00
Gig
30ceed031c Cleaning 2015-04-28 16:18:32 +01:00
Gig
1bfa830f13 Changed machine Materials 2015-04-28 16:07:26 +01:00
Gig
88c8771e8b Moved to Techreborn misc tab 2015-04-28 16:07:02 +01:00
Gig
44814c1aa9 Localizations for new Machines 2015-04-28 16:06:30 +01:00
Gig
34010525ba UU matter 2015-04-27 23:54:22 +01:00
Gig
22a34377e2 Basic Tiles for new machines 2015-04-27 23:51:06 +01:00
Gig
2f9b8a074c More Machines!!!! 2015-04-27 23:43:55 +01:00
Gig
a05b0d01bf More worldgen config pokes @Mj11jM ;) 2015-04-27 22:39:33 +01:00
modmuss50
3c48ea35a7 Added BlastFurnaceRecipe 2015-04-26 17:13:28 +01:00
modmuss50
db62b7a8b8 Now shows the heat of the multiblock 2015-04-26 16:22:26 +01:00
modmuss50
d70038b77f Fixed placing parts inside other parts 2015-04-26 16:05:44 +01:00
modmuss50
98427bbe8a Fixed crash, and lag 2015-04-26 15:35:45 +01:00
modmuss50
f5d58b57eb Fixed crash with cables. 2015-04-26 14:30:34 +01:00
modmuss50
566430d490 Having fun with the new forge!
Done in a different branch because of a depreciated api.
2015-04-26 14:17:59 +01:00
Gig
ea99f354ad Nothing to see here 2015-04-25 22:16:23 +01:00
modmuss50
bc2bf26fc0 Fixed small issue with rendering thanks @amadornes 2015-04-25 12:06:26 +01:00
modmuss50
a80474edd6 fixed compile 2015-04-25 09:24:10 +01:00
modmuss50
0270a917a0 Work on fixing cover dectection 2015-04-25 09:21:06 +01:00
modmuss50
60141026ec Fix multipart checking with Qlib, initial fix of checkOcclusion 2015-04-25 07:38:00 +01:00
Modmuss50
083c24c901 Added all cables, needs a lot of testing :P 2015-04-24 21:22:09 +01:00
Modmuss50
e2467caede Now the multipart system depends on Qlib, wont load if not installed.
Also a code format of the system
2015-04-24 19:46:01 +01:00
Modmuss50
d6797868fb Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/partSystem/IModPart.java
	src/main/java/techreborn/partSystem/QLib/QModPart.java
	src/main/java/techreborn/partSystem/fmp/FMPModPart.java
	src/main/java/techreborn/partSystem/parts/CablePart.java
	src/main/java/techreborn/partSystem/parts/NullPart.java
2015-04-24 19:42:33 +01:00
Modmuss50
0327f3df62 Cables render! Thanks QLIB and @amadornes :) 2015-04-24 19:35:04 +01:00
Gig
4c5477d816 Added Alloysmelter 2015-04-24 15:01:19 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Mj11jM
6e0ec1d861 Updated more!
Commiting this before it's lost. Will finish up the tool-tips later on.
2015-04-23 16:20:04 -07:00
Mj11jM
aa5546af3f Update en_US.lang 2015-04-23 15:15:28 -07:00
Gig
0f4dcdb5d1 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-23 23:06:07 +01:00
Gig
b8170a9eb4 Fixed spelling 2015-04-23 23:06:01 +01:00
Mj11jM
44d36465aa Update en_US.lang for new GUIConfig and spacing
@gigabit101 let me know if there is more to do.
2015-04-23 14:44:50 -07:00
Modmuss50
6232ebc0f5 Removed broken rendering code 2015-04-23 21:23:15 +01:00
Modmuss50
eaa4d304d7 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-23 20:50:04 +01:00
Modmuss50
293a8fbcaf It renders! sort of 2015-04-23 20:49:30 +01:00
Gig
e889b00b6f Added Proxys will need these soon 2015-04-23 20:29:26 +01:00
Gig
4b7b9d4fd2 Removed unused lib 2015-04-23 19:11:30 +01:00
Gig
badc37966a More Localization for @Mj11jM 2015-04-23 19:07:19 +01:00
Gig
ae4f3b5814 Little more work on Achievements 2015-04-23 18:12:11 +01:00
modmuss50
5101abc541 Work on trying to get it to render, still does not work 2015-04-21 18:43:12 +01:00
Gig
214dacffe5 Little work on PDA 2015-04-21 00:55:48 +01:00
Gig
4d8dd1ea4a Added basic rotation to machines 2015-04-20 22:49:58 +01:00
Modmuss50
49d0e480e1 Removed modmussCore 2015-04-20 21:30:24 +01:00
Modmuss50
44d8f09746 Parts are now tiles, they now transmit power :) 2015-04-20 21:16:29 +01:00
Modmuss50
df2ae8b335 Moved into techreborn/partSystem 2015-04-20 21:02:25 +01:00
modmuss50
41795ef16d Removed old ones, and added new ones :) 2015-04-20 20:53:16 +01:00
modmuss50
5164301ffb Added my Part API, need ModmussCore and QLIB 2015-04-20 20:08:14 +01:00
modmuss50
59bf4d1a9b Initial work on the fmp cable 2015-04-20 18:36:04 +01:00
Gig
1a68b5c7c6 Clean
New achievements
Renamed Manuel to PDA
Moved PDA class's to PDA package
2015-04-18 21:24:49 +01:00
Gig
787df47cfa Started on TechManuel 2015-04-18 12:13:22 +01:00
Gig
a42c707470 Added TechrebornMisc creative tab
Moved dusts and cells to misc tab
2015-04-18 11:47:09 +01:00
Modmuss50
1209c78345 The gui now only opens if there is is a full structure next to it. 2015-04-17 21:13:15 +01:00
Modmuss50
7de15ec1a5 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-17 20:40:43 +01:00
Modmuss50
e7096178cf Added basic 3x3x4 multiblock. Next I need to allow it accept lava, and use different machine casings. 2015-04-17 20:40:33 +01:00
Gig
168497db9b tech reborn Manuel Item 2015-04-17 20:12:58 +01:00
Modmuss50
d7ae47e956 Added BeefCore for multiblock api 2015-04-17 20:09:43 +01:00
Modmuss50
bb58ae8632 This was to complicated, going to make it simpler 2015-04-17 20:00:30 +01:00
Gig
89d29c2a5e Added base metals to worldgen 2015-04-17 19:39:31 +01:00
Gig
dc4bd2724e Added compat for buildcraft (WIP) 2015-04-17 19:39:14 +01:00
Modmuss50
37d8f35aee Ok last time, i check i promise 2015-04-17 18:27:44 +01:00
Modmuss50
c4dd21b39e Fixed some compile errors again, sorry :( 2015-04-17 18:24:52 +01:00
Modmuss50
8d8814bb77 Fixed compile errors with last commit, sorry 2015-04-17 17:46:45 +01:00
Modmuss50
8f33305025 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/Core.java
2015-04-17 17:43:44 +01:00
Modmuss50
1eb3ef3db6 Some more work on the multiblock system 2015-04-17 17:42:57 +01:00
Gig
d5628ff93a Added basic achievements 2015-04-17 15:53:54 +01:00
Gig
8bd7974a74 Fixed some gui textures 2015-04-17 15:53:33 +01:00
Gig
b505eeaf30 Added base Ic2 ores 2015-04-17 12:47:10 +01:00
Modmuss50
cad9b8cc56 Initial work on the multiblock system 2015-04-17 11:23:51 +01:00
modmuss50
1f1096dd49 Fixed crash on place 2015-04-17 08:28:07 +01:00
Gig
dc6d186f67 Start on Blast furnace will get @modmuss50 to finish 2015-04-17 01:09:12 +01:00
Gig
4a3214320c Added Machine casings
Added more textures
2015-04-17 00:15:33 +01:00
Gig
3c87b1ad1d Added cells 2015-04-16 23:42:05 +01:00
Gig
7cbd27150e Added small dusts 2015-04-16 23:27:25 +01:00
Gig
39a8ffe739 Changed name of chestplate to gravity chest plate 2015-04-16 23:26:50 +01:00
Gig
5c3e72ea0d Added hardness to Centrifuge 2015-04-16 23:26:03 +01:00
modmuss50
f599a262b2 fixed incorrect cells 2015-04-15 21:11:34 +01:00
Modmuss50
7e0119bce6 Added more nei handers. 2015-04-15 17:46:35 +01:00
Modmuss50
b7ccae4b8c Got the RollingMachine working 2015-04-15 17:27:05 +01:00
Modmuss50
8e7d6b011e Auto formatted, and cleaned imports 2015-04-15 16:23:12 +01:00
Modmuss50
c001231216 Added nei support for centrifuge 2015-04-15 16:22:15 +01:00
modmuss50
bdea893392 More configs and ISidedInventory 2015-04-14 21:23:45 +01:00
modmuss50
a6451e7946 Removed unneeded null checks. 2015-04-14 19:24:40 +01:00
modmuss50
3e2a3cfaa8 Fixed wrench drops 2015-04-14 19:23:16 +01:00
Gig
60bcbd10ad Moved/Replaced Textures 2015-04-14 16:21:23 +01:00
Gig
8191e1eaaa Added Tcon dusts/ingots 2015-04-14 14:41:53 +01:00
Gig
b51a1d498c Even more configs !! 2015-04-14 13:15:47 +01:00
Gig
7d48b81baf made machines wrenchable 2015-04-14 12:57:43 +01:00
Modmuss50
777f54cefd Fixed itemstacks having a null item in them. 2015-04-14 11:09:13 +01:00
Modmuss50
f49b8c27c2 Fixed the centrifuge, still needs some testing. 2015-04-14 08:35:44 +01:00
Gig
4746968a04 Moved batpack/lapotronpack to Items/Armor
Added Gravity Chestplate (WIP)
2015-04-14 01:09:38 +01:00
Gig
700276fb09 Failing ;) 2015-04-14 00:12:24 +01:00
Modmuss50
84ee22b859 Fixed a few crashes, will finish fixing them tomorrow. 2015-04-13 21:02:30 +01:00
Modmuss50
7e9031352a It seams like it works :), still needs some testing. 2015-04-13 20:54:31 +01:00
Modmuss50
822879a6b6 Made it work, need to figure out the ic2 cells, for now it uses resin 2015-04-13 20:36:16 +01:00
Modmuss50
1824e0bf36 WAILA now shows all of the items in the chest 2015-04-13 20:06:20 +01:00
Modmuss50
d45bd4e85c Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-13 20:00:29 +01:00
Modmuss50
2a7b9e19ee Added basic Centrifuge logic. Not finished 2015-04-13 19:59:52 +01:00
Gig
6dec53208e More Configs!!!!! 2015-04-13 19:50:35 +01:00
Gig
dbb6a9edf2 Added advanced drill
Added TorchHelper.class
2015-04-13 19:08:17 +01:00
Gig
82a760a564 whoops 2015-04-13 18:51:39 +01:00
Gig
831eacbd29 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-13 18:43:47 +01:00
Gig
4a291087ad Added omnitool 2015-04-13 18:43:31 +01:00
Modmuss50
bd357e0a2c Added the basic gui, block and tile for the centrifuge 2015-04-13 18:40:13 +01:00
Gig
2b0fd80def Fixed a few spelling mistakes in config 2015-04-13 00:55:53 +01:00
Gig
49474e741e Added charged/uncharged tools to creative tab 2015-04-12 23:39:38 +01:00
Gig
bdc34c393d Added LapotronPack 2015-04-12 23:38:30 +01:00
Gig
a46645ff42 Added lithiumbatpack 2015-04-12 23:22:53 +01:00
Gig
da6e88c254 Added rockcutter 2015-04-12 22:45:13 +01:00
Gig
e5110e2e92 Added textures for storage blocks 2015-04-12 21:16:05 +01:00
Gig
112139ae66 Added gems to oreDict 2015-04-12 21:00:25 +01:00
Gig
1d001364e2 Added recipes for storage blocks 2015-04-12 20:55:11 +01:00
Gig
8366831c62 Fixed a recipes issue 2015-04-12 20:36:21 +01:00
Gig
e4fc82b574 Added storage blocks to oreDict 2015-04-12 20:25:36 +01:00
Gig
f50f144b28 Added storage blocks 2015-04-12 20:21:33 +01:00
Gig
9b5a57bedb More recipes and organized imports 2015-04-12 20:04:12 +01:00
Gig
9712d3828f Changed some IC2 recipes 2015-04-12 18:09:49 +01:00
Gig
d9def7932a Added all ingots to oreDict 2015-04-12 18:09:11 +01:00
Gig
ddd2064a02 A few textures from the wiki ;) 2015-04-12 17:26:01 +01:00
Gig
0a14a36ef4 Added craftingHelper and basic recipes 2015-04-12 16:43:51 +01:00
modmuss50
acb03ff4aa Started working on the multiplayer fix 2015-04-12 16:33:04 +01:00
Gig
4c8a736f58 Lowered Iridiums spawn rate 2015-04-12 15:53:59 +01:00
Gig
fe50e82b76 Fixed a derp in oreDict registry 2015-04-12 15:53:22 +01:00
Gig
961e8f047a Added all ores to Oredict 2015-04-12 14:59:29 +01:00
modmuss50
ee14540196 Removed 2 PreInits, added waila support 2015-04-12 11:39:06 +01:00
modmuss50
e57f1c1e85 Added api package file, testing some gradle changes 2015-04-12 10:25:06 +01:00
modmuss50
fcfc6ed1df added centrifuge recipe + moved itemUtils to its own class 2015-04-12 10:15:53 +01:00
modmuss50
91495286db Clean imports 2015-04-12 09:45:31 +01:00
modmuss50
c942a2278f fixes #1 2015-04-12 09:44:22 +01:00
Gig
a07946c307 Added OreDict to all dusts 2015-04-12 00:03:49 +01:00
Gig
d08da07678 Basic Api (dose nothing yet) 2015-04-12 00:02:56 +01:00
Gig
042f18fbf6 Added a LogHelper for easy logging 2015-04-11 23:13:38 +01:00
Gig
a2995d8cd5 A few textures from @CyanideX texture pack with permission 2015-04-11 23:03:45 +01:00
Gig
4658baab8a Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 21:31:51 +01:00
Gig
3d5439b511 Added Localizations for dusts/gems/ingots/parts 2015-04-11 21:31:38 +01:00
modmuss50
ea812914e8 Fixed building again 2015-04-11 21:03:25 +01:00
Gig
e87f2d2430 Added all gems and crafting parts 2015-04-11 20:46:55 +01:00
Gig
b08afb1d5a Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 19:40:07 +01:00
Gig
801598dc95 WorldGen GET!!!! 2015-04-11 19:40:01 +01:00
modmuss50
66c1e7ec34 quantumTank now holds fluid when broken with a wrench 2015-04-11 19:13:31 +01:00
modmuss50
28abe89511 quantumChest now holds items when broken with a wrench 2015-04-11 19:08:22 +01:00
modmuss50
4cdf4aa7db Added config for ThermalGenerator eu out 2015-04-11 18:29:46 +01:00
Gig
9f99812490 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 18:21:54 +01:00
Gig
adf2558b90 Added WorldGen configs 2015-04-11 18:21:41 +01:00
modmuss50
12a96054dc Fixed drops with wrench 2015-04-11 18:14:57 +01:00
Gig
4e9a738c44 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 18:11:51 +01:00
Gig
a054ac6eba Added config and GuiConfig 2015-04-11 18:11:37 +01:00
modmuss50
a5e18a5b32 Fixed build issues, If we need the whole of ic2 we can add it. 2015-04-11 18:04:36 +01:00
Gig
b3d6ea1358 Made QTank/QChest Wrench able 2015-04-11 17:32:45 +01:00
Gig
57c38eb99e Ore Localizations and changed ore names to "techreborn.ore" 2015-04-11 17:24:32 +01:00
modmuss50
5d76333dd1 Added textures for the quantum stuff 2015-04-11 17:20:53 +01:00
modmuss50
53f540799d Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-11 17:12:47 +01:00
modmuss50
57963575b3 Fixed stackSize issues 2015-04-11 17:12:21 +01:00
Gig
f77e932ef5 Added mod dependencies
Moved Modname and modid to ModInfo.class
2015-04-11 17:12:07 +01:00
Gig
0223f6ae1d Moved Item/Block Registration 2015-04-11 17:03:14 +01:00
Gig
c959f92558 Textures for all the ores 2015-04-11 16:49:46 +01:00
Gig
e87908dc03 Added all gtechs ores 2015-04-11 16:21:49 +01:00
Gig
2281511a20 Added a hardness value to machines 2015-04-11 16:21:24 +01:00
modmuss50
92605dd50f Merge remote-tracking branch 'origin/GigDev'
Conflicts:
	src/main/java/techreborn/Core.java
2015-04-11 15:17:42 +01:00
modmuss50
0e6d635e8d Fixed shift clicking crash, now saves the inventory of the chest 2015-04-11 11:53:27 +01:00
modmuss50
b41adffa60 added quantumChest 2015-04-11 11:30:16 +01:00
modmuss50
1360258257 Added quamtumTank 2015-04-11 10:37:47 +01:00
Gig
1704f989c5 Added ItemTR.class for easy item creation 2015-04-11 00:37:04 +01:00
Gig
6df95800e1 Added basic recipe remover for use in overriding Ic2 recipes. 2015-04-11 00:29:11 +01:00
Gig
0e2ad2637f Added basic Item for all the dusts 2015-04-11 00:12:59 +01:00
modmuss50
ce031af8e7 Added creative tab and Lang Files 2015-04-10 10:55:00 +01:00
modmuss50
25272228e2 Finished the Thermal Generator 2015-04-10 10:43:52 +01:00
modmuss50
07fe6ab3db Added some small things 2015-04-10 10:29:08 +01:00
modmuss50
700012697e Finishing off for tonight. 2015-04-10 00:18:13 +01:00
modmuss50
da25ed6add Added basic mod :) 2015-04-09 23:17:30 +01:00