Commit graph

66 commits

Author SHA1 Message Date
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
Robert S
aff169b0b2 Changes for Return type change for INodeProvider 2014-05-23 01:15:46 -04: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
7d97836613 Update Reference.java 2014-05-17 22:03: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
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
Maxwolf Goodliffe
3da711f20e Merge pull request #2 from Universal-Electricity/development
Massive refactoring, merged Atomic Science into Resonant Induction as At...
2014-05-14 18:30:32 -07:00
Maxwolf Goodliffe
893d1ff628 Massive refactoring, merged Atomic Science into Resonant Induction as Atomic module. All language files merged also! 2014-05-14 09:10:15 -07:00
Robert WC Seifert
a3bf294ab5 Merge pull request #1 from Universal-Electricity/development
Development
2014-05-14 05:42:22 -04:00
Robert S
7615acc605 Updated to use Resonant-Engine as the core mod 2014-05-14 01:32:00 -04:00
tgame14
a57b5fafe8 removed unneeded event listener 2014-05-11 18:03:38 +03:00
Robert S
4de939dcff Updated lang submodule 2014-05-06 01:28:15 -04:00
Robert S
738a673bef Minor lang key change for laser gun 2014-05-06 01:01:48 -04:00
Robert S
aa7e8fdde7 Fixed sync issues with laser when discharging its battery 2014-05-05 22:29:17 -04:00
Robert S
ecf0ea78ac Increased laser charge up delay to 20ticks 2014-05-05 17:41:13 -04:00
Robert S
bace43ead9 Laser gun now consumes energy per tick, also increase cost from 1j to 100j 2014-05-05 17:37:35 -04:00
Robert S
8b2c78ea3e Fixed energy tools using battery boxes capacity tiering 2014-05-05 17:31:46 -04:00
Robert S
7644aadf80 More work on tool prefabs, setup energy tiers, stack limits, and item settings 2014-05-05 17:26:08 -04:00
Robert S
d0ead155d3 Setup translation keys for mode setting & modes for tools 2014-05-05 17:16:54 -04:00
Robert S
8ca3070735 Created some basic tool prefabs which includes support for energy & tool modes 2014-05-05 17:14:18 -04:00
Robert S
e3260ef2e1 Created the start of a mining laser gun, pulled from old assembly line mod 2014-05-04 03:18:13 -04:00
Robert S
990f83d5ce Added toString to several tiles allowing better debug 2014-04-27 15:20:48 -04:00
tgame14
a986e6457d Reworked @Config to support any phase loading 2014-04-21 14:10:05 +03:00
Robert S
4fd8620f2f Created a Inventory version of PartFace mircoblock 2014-04-16 08:12:11 -04:00
Calclavia
3df464812d Fixed #522, #513 - Dust water mixture not generating correctly 2014-04-14 20:35:17 +08:00