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 |
|
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 |
|
Robert S
|
7918802c66
|
Fixed a casting issue and Microblock trait reference to class path
|
2014-05-17 20:24:11 -04:00 |
|
Robert WC Seifert
|
0f733171e7
|
Merge pull request #21 from Adaptivity/patch-1
Fix for #3
|
2014-05-17 15:58:56 -04:00 |
|
tgame14
|
4376342a71
|
change settings.gradle
|
2014-05-17 22:46:13 +03:00 |
|
Anton
|
0c0347bf0c
|
Update Atomic.java
|
2014-05-17 22:04:22 +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 |
|
tgame14
|
8341033ade
|
add idea plugin to RI
|
2014-05-17 16:36:58 +03:00 |
|
tgame14
|
d47b6b1cb4
|
add gitignore
|
2014-05-17 16:27:13 +03: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
|
b6c73f5a7c
|
Removed debug code from Tank Network
|
2014-05-17 08:12:19 -04:00 |
|
Robert WC Seifert
|
b136c3297b
|
Merge pull request #20 from Vexatos/patch-2
Fixed encoding in de_DE.properties
|
2014-05-17 07:57:38 -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
|
0d5adb2dc2
|
Minor item name change
|
2014-05-16 16:18:25 -04:00 |
|
Robert S
|
c5810b0f6d
|
Removed debug
|
2014-05-16 16:10:40 -04:00 |
|
Robert S
|
f3fe505df2
|
Clean up on tank code
|
2014-05-16 15:23:49 -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 |
|
Calclavia
|
4bcc0e701b
|
Merge pull request #17 from Vexatos/patch-1
Update de_DE.properties
|
2014-05-16 07:58:33 -07: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 |
|
Robert S
|
7f81401c32
|
Crate can now be picked up with sneak right click, as well fixed creative mode interaction
|
2014-05-16 08:09:50 -04:00 |
|
Robert S
|
4f8e7a2124
|
Implemented ISneakWrench on tanks as first event driven wrenched block
|
2014-05-16 05:44:13 -04:00 |
|
Maxwolf Goodliffe
|
4c895faf4d
|
Merge pull request #6 from Universal-Electricity/development
Fix for RI atomic module to reference creative tab properly.
|
2014-05-15 23:03:15 -07:00 |
|
Maxwolf Goodliffe
|
b62a9ce93a
|
Fix for RI atomic module to reference creative tab properly.
|
2014-05-15 23:01:41 -07: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 |
|
Maxwolf Goodliffe
|
6fbdf67a47
|
Updated gradle guild script to reference new resonant engine dependency.
|
2014-05-14 00:32:15 -07:00 |
|
Robert S
|
dcabef5621
|
Changed dep from calc-core to resonant-engine
|
2014-05-14 02:28:48 -04:00 |
|
Robert S
|
b0c59913f6
|
Fixed missing import
|
2014-05-14 01:58:36 -04:00 |
|
Robert S
|
7615acc605
|
Updated to use Resonant-Engine as the core mod
|
2014-05-14 01:32:00 -04:00 |
|
Robert S
|
cbe00a617d
|
Fixed dupe issue with mixer, no longer break but does dead
|
2014-05-12 05:08:38 -04:00 |
|
Robert S
|
1fe288a396
|
Worked on Tank's item block to support fluid containers better
|
2014-05-12 03:11:40 -04:00 |
|
tgame14
|
a57b5fafe8
|
removed unneeded event listener
|
2014-05-11 18:03:38 +03:00 |
|
Robert S
|
9e8ae6ade3
|
Fixed double laser render, and laser fade for laser gun
|
2014-05-08 10:11:31 -04:00 |
|
Robert S
|
8f9ff1154e
|
Made laser gun dump energy cache when laser gun is not held by player
|
2014-05-08 08:52:19 -04:00 |
|
Robert S
|
2300100bbd
|
Fixed energy drain issue with laser
|
2014-05-08 08:21:42 -04:00 |
|
Robert S
|
dc3bd53e18
|
Moved ray trace code to calc-core
|
2014-05-08 01:23:42 -04:00 |
|