Commit graph

3984 commits

Author SHA1 Message Date
Zerotheliger
e93f559b74 updated git ignore to ignore eclipse folder 2014-06-03 22:57:56 -07:00
Robert S
6e5b1c9a04 Toyed with new gear network, moved IMechanicalNode into RI from RE 2014-06-04 01:53:20 -04:00
Robert S
7b94737915 Changed pipe node to not care if the provider is an instance of PressureNodeProvider 2014-06-03 00:57:38 -04:00
Robert S
3f032cf721 Moved pipe's pressure node to its own class file 2014-06-02 05:46:24 -04:00
Robert S
dd9b37e997 Changed animation vars slightly 2014-06-02 04:38:44 -04:00
Robert S
748837e0aa Converted quantum assembler to java, lowered required power fixing input issues 2014-05-31 22:36:28 -04:00
Robert S
a6e135e38f Removed mod flag save method as its handled by save manager 2014-05-31 05:29:11 -04:00
Robert S
5196b78796 Removed fiber glass to super conductor recipe 2014-05-31 02:42:19 -04:00
Robert S
6a583c4c72 Made RI -> IC2 wire recipes 2014-05-31 02:04:50 -04:00
Robert S
03c4686f66 Possible fix for laser gun not showing up in creative tab 2014-05-31 00:41:08 -04:00
Zerotheliger
69e939fec7 changed temp cobble stone recipe for industrial cobble stone to requiring charcoal in the center and now it correctly gives 8 industrial cobble stone 2014-05-30 21:08:20 -07:00
Zerotheliger
2a7ddce1aa Refactored name of class from machine part to Industrial Stone at request of dark
Moved industrial stone class from resources to its own block packaged
Added recipe class for all industrial stone blocks all but 2 industrial blocks can be crafted
Changed localized names to match updated class
2014-05-30 04:44:03 -07:00
Zerotheliger
593029c815 removed unneeded trays only 2 step process for bread
shapeless crafting with 2 wheat = 1 flour
grinder + 1 wheat = 1 flour
water bucket + flour = dough
dough in furnace = bread
2014-05-29 20:02:39 -07:00
Zerotheliger
d40354ee9d Added Grinding Recipes For Wheat to flour 2014-05-29 03:08:13 -07:00
Zerotheliger
ee9c86d864 Added Flour :3 2014-05-29 02:43:09 -07:00
Robert S
4da9aec9f7 Worked out a few issue with /machine command 2014-05-28 20:58:30 -04:00
Robert S
0e42b23e80 Created the staff of devs item, designed to be used for debug tasks 2014-05-28 20:22:54 -04:00
Robert S
a88bc11666 Registered Machine command 2014-05-28 19:54:37 -04:00
Robert S
a0e1f50aee Worked on get and set energy commands 2014-05-28 19:49:42 -04:00
Robert S
46f6add9ba Started on a chat command to help debug machine data 2014-05-27 22:49:01 -04:00
Robert S
965ec49b16 Changed crates to place items into player's inventory vs dropping them on the floor 2014-05-27 03:28:31 -04:00
Robert S
ab5fdfa34e Reduced the eject click timer for crates 2014-05-27 03:18:29 -04:00
Robert S
d93d4b2fce Fixed some minor issues with creative mode interaction with crates 2014-05-27 03:11:34 -04:00
Robert S
a3e04fe15a Disabled item rail until tgame14 has a chance to finish it 2014-05-26 16:57:22 -04:00
tgame14
78ba973732 Complete redesign and repackage of Item Railings, some cleanup before moving to 1.7 2014-05-25 21:27:55 +03:00
Robert S
9bbc8e4d2c Reformatted MechanicalNode.class 2014-05-24 21:34:58 -04:00
Robert S
af32448001 Fixed gear shaft being in the wrong package 2014-05-24 21:06:49 -04:00
Robert S
47154b7d82 More work on new gear network, coded split & merge methods, made gear node a connector 2014-05-24 15:16:49 -04:00
Robert S
9d21e4ee98 Separated Gear's node class from PartGear to make the code cleaner 2014-05-24 14:50:29 -04:00
Robert S
9b67a2d66d Moved some stuff around, and started on new gear network code 2014-05-24 14:28:03 -04:00
Maxwolf Goodliffe
fd1a182cb2 Fixed plasma heater custom hit particles not appearing correctly. 2014-05-23 06:07:34 -07:00
Maxwolf Goodliffe
5bacac6812 Added custom hit particles for all atomic science machines and armbot. 2014-05-23 05:33:59 -07:00
Maxwolf Goodliffe
a3a728e307 Lowered the amount of reactor cells needed around another reactor cell to re-encrich fissle fuel rods to two. This allows for full automation and inserting/extracting rods from center reactor cell. 2014-05-23 03:59:18 -07:00
Robert S
aff169b0b2 Changes for Return type change for INodeProvider 2014-05-23 01:15:46 -04:00
Robert S
5d44e79e5b Fixed an issue with conveyor belts failing to load from saves 2014-05-23 00:35:55 -04:00
Maxwolf Goodliffe
28b6c601cd Fixed pathing issue to hazmat armor texture that appears on the player. 2014-05-22 21:02:49 -07:00
Robert S
2627bd6b0b Merge branch 'development' of https://github.com/Universal-Electricity/Resonant-Induction into development 2014-05-22 23:36:03 -04:00
Robert S
2ed0c28fc6 Re-Enabled armbot in attempts to revive it 2014-05-22 23:34:58 -04:00
Calclavia
a6904856ae Merge pull request #34 from Vexatos/patch-3
Update de_DE.properties
2014-05-23 08:16:05 +08:00
Vexatos
044d731a91 Update de_DE.properties 2014-05-22 21:32:12 +02:00
Robert S
75be41d49a Reduced belt speed, and fixed animation loop 2014-05-22 15:11:15 -04:00
Robert S
7bb06255e0 Fixed how textures are handled on conveyor belt render to improve performance 2014-05-22 15:02:54 -04:00
Robert S
9d84de4761 Removed node system from conveyor belts for the time being 2014-05-22 13:31:57 -04:00
Maxwolf Goodliffe
7211a85d97 Swapped anti-matter tooltip values so they would be correct. 8*125 milligrams = 1 gram 2014-05-21 06:25:17 -07:00
Maxwolf Goodliffe
f07f670a57 Fixed bug with reactor cells not triggering meltdown state properly. 2014-05-21 06:09:59 -07:00
Maxwolf Goodliffe
700560124b Fixed sounds not playing for turbine or reactor cell. 2014-05-21 06:09:38 -07:00
Maxwolf Goodliffe
e00df32267 Fixed tooltips not properly showing up in atomic age machines. 2014-05-21 06:09:08 -07:00
Calclavia
c79f616f32 Merge branch 'master' into development
Conflicts:
	atomic/src/main/scala/resonantinduction/atomic/Atomic.java
2014-05-20 07:16:12 +08:00
Robert WC Seifert
3a90af46fe Merge pull request #23 from Adaptivity/patch-1
Finish Russian localization
2014-05-18 18:34:30 -04:00
Robert S
0a534f2eae Made a crate crafting handler, should prevent item loss when upgrading crates 2014-05-18 07:53:39 -04:00