Robert S
5cd22a8dd0
Update laser content to use RI reference object
2014-08-13 10:17:56 -04:00
Robert S
e522ddeb14
Commented out a few things on wires to allow for compiling
2014-08-13 10:00:26 -04:00
Robert S
9842a1a0ad
Disabled wires on my end leaving those to @Calclavia to fix
2014-08-13 09:47:49 -04:00
Robert S
4be81589a3
Almost done with error correction for 1.7.10
2014-08-13 09:46:26 -04:00
Robert S
f5ad331769
More error corrections for 1.7.10 update
2014-08-13 08:08:04 -04:00
Calclavia
131b7ed790
Fixed iterable by importing alias java.lang.{Iterable=>JIterable}
2014-08-11 09:34:00 -04:00
Robert S
5eb0b4d380
Fixed errors in NEI support, made RecipeTypes a java enum, and more general updating
2014-08-11 08:41:08 -04:00
Robert S
c09d9af837
More updating to 1.7.10 aka error hunting
2014-08-11 08:13:27 -04:00
Robert S
d1e1f47441
Worked on transformer errors
2014-08-11 05:54:28 -04:00
Robert S
946959bd2e
Cleaned up multimeter code, still have to correct its network code
2014-08-11 04:41:58 -04:00
Robert S
6db933cc7d
All around error correction, slowly starting to compile
2014-08-11 03:47:13 -04:00
Robert S
b1a148ee97
Fixed some errors made so many more
2014-08-11 01:44:06 -04:00
Robert S
f394508574
Minor error correct, move atomic content to AtomicContent object
2014-08-11 00:41:09 -04:00
Calclavia
3d76c78d0e
Fixed ItemBlockCrate ambiguous function
2014-08-10 23:49:44 -04:00
Robert S
c0fdf0a664
Worked on fluid devices
2014-08-09 04:28:14 -04:00
Robert S
2a0b831602
Corrected errors and converted Cast & millstone to SpatialBlock
2014-08-09 03:47:48 -04:00
Robert S
9379788eb0
Generic error correct
2014-08-09 02:43:42 -04:00
Robert S
7c0cea635d
Some work on hotplate and firebox
2014-08-09 00:41:52 -04:00
Robert S
9a4acf902f
Removed errors from tesla tower and its effects
2014-08-08 00:48:51 -04:00
Robert S
db15b85ae8
Moved Turbine package
2014-08-07 23:58:05 -04:00
Robert S
00855a5d15
Removed most errors out of atomic module, moved electrical turbine to mech module
2014-08-07 23:52:02 -04:00
Robert S
0474addef6
Worked on atomic machines
2014-08-07 02:57:34 -04:00
Robert S
d751b54b3a
Updated version # for mods in build prop file
2014-08-06 22:35:04 -04:00
Robert S
8c7b2bf9f6
Updated build prop
2014-08-06 22:25:09 -04:00
Robert S
c6a9f23349
More error corrections and scala conversions
2014-08-06 12:50:58 -04:00
Robert S
9d5a41dec7
More general update work
2014-08-06 07:57:45 -04:00
Robert S
515179ea32
Worked threw and removed 90% of errors out of mech age
2014-08-06 03:50:22 -04:00
Robert S
41d5a0dc07
Mo' work, removed charger & sorter for the moment
2014-08-06 00:07:23 -04:00
Robert S
5f57391ed9
More work on 1.7 update, deleted some unused code
2014-08-05 19:54:19 -04:00
Robert S
471812e409
Mo' Work
2014-07-29 18:48:32 -04:00
Robert S
a311e2224e
Worked on QuantumGate classes
2014-07-29 15:47:22 -04:00
Robert S
cc9886c126
More error removal
2014-07-29 03:56:07 -04:00
Robert S
9f36676ef7
Fixed most Atomic Item errors and start converting TileReactor to scala
2014-07-28 11:50:04 -04:00
Robert S
23f4cb743c
Removed Errors from Atomic Module Block section
2014-07-28 11:03:28 -04:00
Robert S
28db0ec6d3
Converted BlockCrate to scala, still need to merge the tile with it
2014-07-25 09:34:30 -04:00
Calclavia
3a6eb9e9b1
Added implicit ItemBlockCrate conversion
2014-07-22 22:12:14 -04:00
Robert S
4978a7b9ba
More work turning crate classes to scala
2014-07-22 20:47:29 -04:00
Robert S
fcce578fab
Fixed errors and turned crate into a scala class
2014-07-22 15:55:33 -04:00
Robert S
1fe751f547
Changed crate crafting to use a recipe instead of handler object
2014-07-22 15:55:09 -04:00
Robert S
a20db4091b
Remove extra waila api file, converted 2 classes to scala
2014-07-22 14:00:37 -04:00
Robert S
e677fa0ddf
Removed Conveyor Belt
2014-07-22 12:29:18 -04:00
Robert S
cbd4df0303
Removed laser gun, and item railing
2014-07-22 12:22:27 -04:00
Robert S
8aadbab7b5
Started converting TileGrate to scala
2014-07-22 02:32:42 -04:00
Robert S
c734a80f5d
Converted ItemHammer to scala
2014-07-22 02:32:26 -04:00
Robert S
f26318fbcb
Some white space change by formatter
2014-07-22 02:17:12 -04:00
Robert S
def24044bb
Fixed Archaic Recipe code
2014-07-22 02:12:57 -04:00
Robert S
87fa1b92d6
Small test start
2014-07-22 01:58:53 -04:00
Calclavia
887e088b14
1.7 update work
2014-07-21 11:47:39 -04:00
Calclavia
2dc5dbeb3a
Fixed some tank node logic
2014-07-21 09:15:22 -04:00
Calclavia
9881d2d209
General 1.7 update
2014-07-18 19:48:40 -04:00
Calclavia
fdb94fe2a9
Changed ResourceGenerator to use name string
2014-07-16 23:48:13 -04:00
Calclavia
ffc011cbb5
1.7 update work
2014-07-16 20:07:57 -04:00
Calclavia
eeee9532ab
More core update work
2014-07-15 18:58:44 -04:00
Calclavia
0db386ba12
Updated some resource classes
2014-07-15 18:41:16 -04:00
Calclavia
090743e4c8
Updated integer vector coordinate methods
2014-07-14 23:29:21 -04:00
Calclavia
66789c4658
Converted PartAdvanced to TraitPart
2014-07-14 18:09:56 -04:00
Calclavia
8fb8062ae6
Updated PacketMultiPart
2014-07-14 18:08:28 -04:00
Calclavia
ab24fa1fa1
Removed some baking items
2014-07-14 17:55:41 -04:00
Calclavia
7f56f5f656
More core resource update
2014-07-14 17:55:12 -04:00
Calclavia
4b273c9b18
Added ChickenBonesWrapper
2014-07-14 17:44:19 -04:00
Calclavia
4d314006c7
Added basic components items
2014-07-14 17:42:48 -04:00
Calclavia
0fddcd5989
Removed Armbot
2014-07-14 17:33:01 -04:00
Calclavia
fb9c712a41
Removed Encoder
2014-07-14 17:32:46 -04:00
Calclavia
4e90d5ab0a
Rewrote some fluid grid
2014-07-14 17:29:24 -04:00
Calclavia
934eee39c6
Refactored fields in Reference
2014-07-14 16:35:26 -04:00
Calclavia
15ac700074
Updated initial content registration
2014-07-14 16:20:02 -04:00
Calclavia
020e13c7f8
A lot of import fixes
2014-07-14 14:46:49 -04:00
Calclavia
1890a56a8f
Merged Electromagnetic Coherence
2014-07-13 22:58:16 -04:00
Calclavia
ed32742f7d
Moved all classes to src/main/java
2014-07-13 22:53:45 -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
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
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
Robert S
ccffd62055
Change solar energy config from long to int
2014-04-10 19:06:47 -04:00
Robert S
a90f300602
Moved power configs to settings class, attempting to fix missing config gen
2014-04-10 17:29:16 -04:00
tgame14
c5368ba283
Added support for any phase loading, This will leave no values unconfigured
2014-04-10 20:57:21 +03:00
tgame14
9b3c87bbb6
Fully Disabling late phase config
2014-04-09 22:36:31 +03:00
tgame14
b9204e859f
Temporarily disabling Advanced Late Phase Config handling
2014-04-09 22:26:31 +03:00
tgame14
03551e21a0
Adjusted Resonant Induction to respond to late phase @Config loading
2014-04-09 19:29:35 +03:00
Robert S
9b86de1bce
Moved damage prefabs to core
2014-03-25 14:41:34 -04:00
Calclavia
5cf5b41dc1
Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development
...
Conflicts:
src/main/scala/resonantinduction/core/ResonantInduction.java
src/main/scala/resonantinduction/core/resource/ResourceGenerator.java
2014-03-25 21:10:46 +08:00
Calclavia
bdf8b146ec
Added ability to use normal dust as a dust block for smelting
2014-03-25 21:03:45 +08:00
Robert S
e7e2768d19
Fixed block IDs for fluids not showing up in configs
2014-03-25 08:31:51 -04:00
Robert S
ea176da493
Fixed NPE if fluid blockID is null when using a fluid bucket
2014-03-25 08:13:12 -04:00
Robert S
6c93020dea
Implemented a few more configs for resource generator
2014-03-25 08:03:40 -04:00
Calclavia
e58c5209d4
Resolved #485 - Refined dust now registers as dust
2014-03-25 19:39:53 +08:00
Robert S
e6d0cc5319
Created a config to disable the ore generator in total
2014-03-25 07:34:42 -04:00
tgame14
de0421dba0
Removing override in fluidpressurenode
2014-03-24 19:15:13 +02:00
Calclavia
90a85e7dcb
Moved everything to scala folder
2014-03-23 17:19:47 +08:00
