Commit graph

233 commits

Author SHA1 Message Date
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
Robert S 02118497f9 Added textures for block placer 2014-03-20 22:28:01 -04:00
Calclavia 73f13f5712 Block breaker now semi-working 2014-03-19 22:08:58 +08:00
Calclavia 3f122cd2dd New sorter model 2014-03-14 18:03:51 +08:00
Calclavia 3cd1b8759f New quantum glyph textures 2014-03-14 17:58:46 +08:00
Calclavia c4a6d1c721 Fixed mixer model render and insulation localization 2014-03-14 17:41:22 +08:00
Calclavia 3f29f38449 Resolved #433 - Added more localizations 2014-03-13 21:15:44 +08:00
Calclavia af43dc1d60 Resolved #417 - Tesla now only transfer to similar colored 2014-03-13 20:53:36 +08:00
Calclavia bf08756a82 Added insulation item for wires 2014-03-13 20:26:53 +08:00
Calclavia 0a228514b7 Fixed #427 - Engineering table consume twice and glitched drops 2014-03-12 21:35:05 +08:00
Calclavia edff518b72 Fixed IMechanicalNode dependent on MechanicalNode 2014-03-12 18:50:04 +08:00
Calclavia f05e01cac1 Resolved #429 - Missing localization 2014-03-12 17:46:23 +08:00
Calclavia 931ef14708 Updated localizations 2014-03-12 17:05:31 +08:00
Calclavia 57a26afa07 Added language submodules 2014-03-11 10:19:08 +08:00
Calclavia 387257f1ec Removed languages 2014-03-11 10:18:32 +08:00
Calclavia 1c6aa00f43 Quantum gates now work between dimensions 2014-03-10 04:50:33 +08:00
Calclavia ac5b51c131 Quantum gates now calculate frequency properly 2014-03-08 23:01:31 -08:00
Calclavia 6a0ffe582e Started to work on Quantum Gates 2014-03-08 22:30:08 -08:00
Calclavia ce2beb65ee Sorter now can accept item pipe input 2014-03-08 21:09:50 -08:00
Calclavia 74c00b802f Fixed #358 and framed wire not connecting properly 2014-03-08 19:52:10 -08:00
Calclavia 9b6d67a02b Changed gutter to be stone 2014-03-08 19:23:03 -08:00
Calclavia 207610916d Resolved #402 - Added different pipe materials and colors 2014-03-08 18:15:52 -08:00