Commit graph

199 commits

Author SHA1 Message Date
modmuss50
5eed5b161d Code formatter take 2 2016-03-25 09:47:34 +00:00
modmuss50
33985f1a31 Revert "Added code formatter"
This reverts commit b9448d5d90.
2016-03-24 00:41:47 +00:00
modmuss50
b9448d5d90 Added code formatter 2016-03-24 00:39:26 +00:00
modmuss50
7a121be651 Some small fixes 2016-03-13 16:57:10 +00:00
modmuss50
7f920b282f Optimise imports to make it easier to find and replace package names 2016-03-13 15:37:55 +00:00
TheDoctorSoda
c5302f8d6b Add description page to JEI on how to obtain sap 2016-03-07 23:15:53 -08:00
gigabit101
080b633493 Finish up on recycler and temp jei handler 2016-03-07 14:07:52 +00:00
TheDoctorSoda
ca3cd6d4f8 Scrapbox JEI handler and modified some scrapbox recipes
This is my first JEI handler, kinda just stole it from the compressor. hope I did good?
2016-03-06 22:23:25 -08:00
gigabit101
02ac62a180 Started Recycler 2016-03-06 23:15:28 +00:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
gigabit101
fb12bfab9e Changed upgrade slots to SlotUpgrade 2016-02-25 14:21:31 +00:00
modmuss50
46cdf8f587 Fixes to configs, optimise imports. 2016-02-24 08:18:21 +00:00
modmuss50
71c2bfee7f Moved power system to RC and spawn trees in groups 2016-02-20 16:59:31 +00:00
gigabit101
047625389d Added compressor, extractor, electric furnace 2016-02-20 03:07:56 +00:00
gigabit101
8ad4a45716 Added basic Grinder 2016-02-20 00:57:57 +00:00
modmuss50
9268fa4d55 1117 lines of new recipes?
Added a new recipe manager to allow us to list the missing items that need to be reimplemented.
2016-02-19 20:32:26 +00:00
Modmuss50
869e6d4bf8 Fixed compile errors 2015-11-26 19:33:52 +00:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
Modmuss50
fa9cd98b5a 4693 2015-11-23 14:47:50 +00:00
Modmuss50
011ebaba1d 4862 2015-11-23 14:45:16 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
modmuss50
7bcc793d12 Added javaDoc and updated deps 2015-11-22 16:24:50 +00:00
Modmuss50
758d918bdb Got the Vacuum Freezer working. 2015-11-18 08:35:34 +00:00
Modmuss50
3114576e7b Most of the Vacuum Freezer(Not working just yet) 2015-11-17 21:48:06 +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
9b6383a548 fixes #251 2015-11-11 18:38:43 +00:00
Modmuss50
f4a3e87ebb Fixes #233 2015-11-11 15:54:19 +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
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +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
50fa2e8a1d Fixes #194 2015-10-22 18:19:05 +01:00
Modmuss50
2d06d726b4 Started work on rewriting the item power API 2015-10-14 20:57:44 +01:00
gigabit101
935a8bc382 Removed more junk 2015-10-09 22:11:04 +01:00
modmuss50
a390a37cb1 Fixes forestry saw mill recipes 2015-10-03 12:39:18 +01:00
Modmuss50
081f16a533 Removed Farm 2015-09-23 18:58:46 +01:00
Modmuss50
1f2e703c4f Fixed incorrect location for Blocks API 2015-09-23 17:37:25 +01:00
modmuss50
8aafd118f5 Added fluid power manager, imports from forestry and bc 2015-09-08 18:39:59 +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
modmuss50
fe049cc160 Added Blocks and items to the api 2015-08-10 19:41:28 +01:00
gigabit101
f58fbfe0e8 Added alot of work on the PDA still {WIP} 2015-08-10 18:30:19 +01:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
3db7271fd1 Added recipe list exporting to json 2015-07-27 14:13:22 +01:00
modmuss50
07c9ee97d4 Added test recipe for blast furnace 2015-07-25 15:32:20 +01:00
modmuss50
466f50b232 fixes #44 2015-07-25 15:13:52 +01:00
gigabit101
bac2cdcbc6 closes #55 2015-07-24 22:29:00 +01:00
modmuss50
ef11f111ed Started work on a way to find duplicate items 2015-07-23 16:57:06 +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
462aa20710 Fixed the BlastFurnace 2015-07-20 15:19:23 +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
gigabit101
26eff9bcbf Removed fluid tank from IndustrialElectrolyzer closes #58 2015-07-02 23:39:36 +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
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +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
4fae706242 Started work on new power api 2015-07-01 12:56:45 +01: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
modmuss50
40ca57331c fixes #55 2015-06-26 21:28:16 +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
a0a97a405b Fixes #50 2015-06-25 19:41:03 -04: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
f92f67232a some improvements to tick time 2015-06-25 08:28:29 +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
c6bc7f6fb8 Little more work on pda lots more to do 2015-06-20 11:24:04 +01:00
modmuss50
be296c69aa Fixed syncing items 2015-06-14 19:11:26 +01:00
Tntrololol
496d8c4ba2 Fixed Industrial Sawmill recipe constructor (fixes compiler error) 2015-06-12 21:30:35 -05:00
modmuss50
0ea07a6a1a added way to not use ore dic 2015-06-11 21:35:05 +01: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
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
joflashstudios
02fce02d7b Said goodbye to RecipeHanderer
A bunch of ModRecipes fixes
2015-06-08 10:45:21 -04:00
modmuss50
8187708e03 Fixed on/off textures when power runs out 2015-06-07 19:22:17 +01:00
modmuss50
23bf14b37d Clean the sawmill gui a bit, and remove debug code 2015-06-07 18:58:31 +01:00
modmuss50
950f556770 Fixed issue when not enough imports are present. 2015-06-07 18:22:31 +01:00
modmuss50
089f5500e6 removed unneeded debug code 2015-06-07 14:27:19 +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
94803e88f3 attempt at fixing the item stack size issue 2015-06-07 09:21:37 +01:00
modmuss50
972efc4481 A commit, it might be the answer to everything 2015-06-06 21:59:54 +01:00
modmuss50
4d76a3071d My mind is blown :D Not sure whats up 2015-06-06 21:41:41 +01:00
modmuss50
8a1f0a18cd Fixed crash when saving not, fixes saving items, fixes #19 2015-06-06 07:32:20 +01:00
modmuss50
0749385e49 About to give up. Here is what ive got. 2015-06-01 21:29:39 +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
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
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
cf8628cd2a Fixed inputs not being used 2015-05-27 14:44:48 +01:00
modmuss50
8055546675 Trying to fix the sync issue 2015-05-27 12:19:11 +01:00
modmuss50
d6a1c9724b Fixed disappearing items 2015-05-26 17:29:01 +01:00