Commit Graph

1255 Commits

Author SHA1 Message Date
Robert S 0b38ce5ba3 Compressed sub folder into main src folder making compile time easier 2014-10-21 19:20:46 -04:00
dmodoomsirius 3875281b83 Fixed Can't find symbol errors 2014-10-21 16:08:21 -04:00
Calclavia 959505258d Merge branch 'development' 2014-06-25 13:52:12 -04:00
Calclavia 8bed6932ea #RI-37 fixed - Glitchy tank rendering 2014-06-20 16:25:30 -07:00
Robert S 182876fb09 NPE fix for CommandMachine when dev staff is null 2014-06-19 02:22:29 -04:00
Maxwolf Goodliffe d7ec01840c Fixed missing icon for biomass. 2014-06-15 15:48:22 -07:00
Maxwolf Goodliffe 7f0a480012 Added localization for Laser Drill and Biomass. 2014-06-15 15:46:17 -07:00
Maxwolf Goodliffe 17a90ba782 Tweaked electric turbine sound to player every 20 ticks (1 second) instead of 1.3 seconds. 2014-06-15 15:42:21 -07:00
Robert S 6cb7904e30 Merged left and right display for debug frames, implemented better display for gear debug frame 2014-06-15 14:23:51 -04:00
Robert S d7cb8c8a64 Created a debug frame for pipes, improved visuals of debug frames 2014-06-15 14:06:10 -04:00
Vexatos a4b15e13ab Update de_DE.properties 2014-06-15 16:23:24 +02:00
Robert S aed4ea5f90 Fixed import issue causing RI to not compile 2014-06-13 10:30:17 -04:00
Robert S 6af3bb2d50 Toyed with debug frame adding location data and setup debug GUI content 2014-06-12 09:27:24 -04:00
Robert S 2a884fabc8 Updated MechanicalNodeFrame to extends FrameNodeDebug 2014-06-12 04:04:45 -04:00
Robert S 7468a38b8a Created a prefab for Debug Frame GUI and added a few interfaces to go with it 2014-06-12 02:20:31 -04:00
Robert S 2a6229638b Added max speed to grinder, still needs tuned but limits are setup 2014-06-11 04:50:12 -04:00
Robert S b515691a20 Fixed a compile issue with accessing something i can't in the code 2014-06-10 12:58:08 -04:00
Robert S 1773bc4b2d Changed debug GUI for gears to support any MechanicalNode 2014-06-10 10:42:56 -04:00
Robert S b06a5ea283 Created a prefab for tiles with several nodes 2014-06-09 20:35:47 -04:00
Maxwolf Goodliffe e86b2daa6d Fixed NPE when breaking pipe connected to a pump. 2014-06-05 20:23:39 -07:00
Robert S 3404a103c0 Moved IMechanicalNode to fix a gradle issue 2014-06-04 09:35:44 -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
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
Maxwolf Goodliffe 5bacac6812 Added custom hit particles for all atomic science machines and armbot. 2014-05-23 05:33:59 -07:00
Robert S aff169b0b2 Changes for Return type change for INodeProvider 2014-05-23 01:15:46 -04:00
Vexatos 044d731a91 Update de_DE.properties 2014-05-22 21:32:12 +02: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
Calclavia c79f616f32 Merge branch 'master' into development
Conflicts:
	atomic/src/main/scala/resonantinduction/atomic/Atomic.java
2014-05-20 07:16:12 +08:00
Anton 9f69567fb3 small fix 2014-05-18 12:27:26 +04:00
Anton 743b90cc77 Update ru_RU.properties 2014-05-18 12:24:46 +04:00
Anton 7d97836613 Update Reference.java 2014-05-17 22:03:32 +04:00
Anton bb1f08055c Create ru_RU.properties 2014-05-17 22:01:32 +04:00
Robert S 88dd118577 Merge remote-tracking branch 'origin/master' into development 2014-05-17 09:13:47 -04:00
Robert S dbcd5aad20 Moved a few prefabs into their correct packages, also removed debug spam 2014-05-17 09:12:42 -04:00
Vexatos 05671f4b10 Fixed encoding in de_DE.properties 2014-05-17 13:30:25 +02:00
Robert S b46c9847be Slight change in armor, and addition of biomass 2014-05-17 04:45:12 -04:00
Robert S a3e04e0747 Tank network works again, animation still needs fixed 2014-05-16 15:06:05 -04:00
Robert S ae3cba60f6 More work to fix issues with tanks being filled by a bucket 2014-05-16 14:41:11 -04:00
Robert S 0e5633fcd0 Rewrote tank network in attempt to fix filling issue 2014-05-16 12:03:09 -04:00
Robert S 2a0d5454eb Changed TileFluidDistribution to return network tank instead of internal tank 2014-05-16 10:30:36 -04:00
Vexatos 91a858ff3d Update de_DE.properties 2014-05-16 15:59:46 +02:00