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 |
|
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 |
|
Calclavia
|
a8d5820fdf
|
Removed language submodule
|
2014-05-14 16:34:22 -07:00 |
|
Calclavia
|
d02e11b729
|
Updated languages
|
2014-05-14 16:33:56 -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
|
e751c1f9b0
|
Laser gun texture
|
2014-05-04 05:19:58 -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 |
|
Robert S
|
e210232629
|
Another attempt
|
2014-04-26 15:57:52 -04:00 |
|
Robert S
|
4ca228ff65
|
Lets try this and see if it works (dark starts to go crazy)
|
2014-04-26 15:44:44 -04:00 |
|
Robert S
|
d603344028
|
Quick file change test
|
2014-04-26 15:23:11 -04:00 |
|
Robert S
|
0ce70d2d07
|
Another attempt to fix build issue
|
2014-04-26 15:15:59 -04:00 |
|
Robert S
|
6fe19c5686
|
Added waila to each sub mod src folder in attempt to fix build server, need a better way to handle this
|
2014-04-26 14:55:46 -04:00 |
|
Robert S
|
b34dc134ad
|
Changed api java -> api scala
|
2014-04-26 13:03:10 -04:00 |
|
Robert S
|
5dcbacb8a0
|
Added waila src to the api folder to fixed build issues
|
2014-04-26 12:59:53 -04:00 |
|
tgame14
|
a986e6457d
|
Reworked @Config to support any phase loading
|
2014-04-21 14:10:05 +03:00 |
|
Calclavia
|
e34ef8e294
|
Finished mechanical piston render and model
|
2014-04-18 18:14:40 +08:00 |
|
Robert S
|
4fd8620f2f
|
Created a Inventory version of PartFace mircoblock
|
2014-04-16 08:12:11 -04:00 |
|
Calclavia
|
41b83362b2
|
Updated some textures
|
2014-04-15 21:28:46 +08:00 |
|
Calclavia
|
3df464812d
|
Fixed #522, #513 - Dust water mixture not generating correctly
|
2014-04-14 20:35:17 +08:00 |
|
Robert S
|
597df343b1
|
Updated languages submodule
|
2014-04-14 06:41:12 -04:00 |
|