Commit graph

254 commits

Author SHA1 Message Date
Calclavia
706436530a Rewrote ResourceFactory and AutoResourceFactory 2015-01-09 20:17:46 +08:00
Calclavia
619ba6d620 Added workbench model and upgrade 2015-01-09 12:10:44 +08:00
Calclavia
c6aa2153b2 Fixed pipe tooltip 2015-01-08 22:10:20 +08:00
Calclavia
4ef91cc130 Fixed workbench render coloring 2015-01-08 22:03:35 +08:00
Calclavia
b46156c0f1 Fixed generated resource item names 2015-01-03 20:32:51 +08:00
Calclavia
1ee6b29590 Added sounds JSON file 2015-01-03 20:10:03 +08:00
Calclavia
1d60a0e3d6 Hammering now works again 2015-01-03 19:54:54 +08:00
Calclavia
ab142ce7b7 Some work on the workbench 2015-01-02 16:13:22 +08:00
Calclavia
d50d2412e1 Added mixture and molten buckets 2014-12-29 11:52:22 +08:00
Calclavia
e16246e6b1 Fixed dust, refined dust and rubble name and texture 2014-12-27 15:28:04 +08:00
Calclavia
2655b508f9 Fixed some item name and tooltip formatting 2014-12-26 02:28:59 -08:00
Calclavia
2cfdd91fea New motor model and render 2014-11-22 23:11:56 +08:00
Calclavia
6925e226a6 Added new hot plate texture 2014-11-18 09:59:23 +08:00
Calclavia
b77f2d944d Revived Electromagnetic Coherence 2014-10-25 20:31:19 +08:00
Robert S
25eb5cf0e9 Reworked AtomicContent.class to calc's specs 2014-10-15 14:06:18 -04:00
Robert S
35e4424b98 Fixed names not showing up for decor, and a few atomic items 2014-10-15 13:44:34 -04:00
Calclavia
99ecd7e40e Fixed frame wire renderer 2014-09-21 15:48:58 +08:00
Robert S
e342cef7d6 Fixed en_US.lang file 2014-09-13 09:48:41 -04:00
Calclavia
9bbdd4ec0b Fixed to new language system 2014-07-17 21:49:53 -04:00
Calclavia
1890a56a8f Merged Electromagnetic Coherence 2014-07-13 22:58:16 -04: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
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
ee9c86d864 Added Flour :3 2014-05-29 02:43:09 -07: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
Maxwolf Goodliffe
5bacac6812 Added custom hit particles for all atomic science machines and armbot. 2014-05-23 05:33:59 -07: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
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
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
Vexatos
91a858ff3d Update de_DE.properties 2014-05-16 15:59:46 +02: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 S
4de939dcff Updated lang submodule 2014-05-06 01:28:15 -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
Calclavia
e34ef8e294 Finished mechanical piston render and model 2014-04-18 18:14:40 +08:00
Calclavia
41b83362b2 Updated some textures 2014-04-15 21:28:46 +08:00
Robert S
597df343b1 Updated languages submodule 2014-04-14 06:41:12 -04:00
Calclavia
17e065bd22 Updated languages 2014-03-27 21:59:52 +08:00
Calclavia
cf6d3cdb30 Fixed breaker and placer textures and rotations 2014-03-24 20:49:52 +08:00
Calclavia
82382bfd54 Fixed minor tank z-fighting and optimized render 2014-03-22 14:39:34 +08:00
Calclavia
e159f2466b Fixed placer textures 2014-03-21 17:41:30 +08:00
Robert S
1a816899d0 Fixed block placer not saving auto pull state 2014-03-20 23:19:10 -04:00