maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1096 commits 1 branch 0 tags 80 MiB
Commit graph

985 commits

Author SHA1 Message Date
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