Commit graph

233 commits

Author SHA1 Message Date
Calclavia
b4606b23da Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-19 13:36:07 +08:00
DarkGuardsman
d7a3a0a874 Flip steel and iron crate textures 2014-01-19 00:27:15 -05:00
Calclavia
503e7a5d17 Added TileMechanical 2014-01-19 13:11:36 +08:00
Calclavia
12fe602ced Added renderer for grinder wheel 2014-01-19 13:06:26 +08:00
Calclavia
011f9b64fa Reduced volume of grinder 2014-01-18 18:36:48 +08:00
Calclavia
a202737f48 Added rubble and refined dust 2014-01-18 17:41:10 +08:00
Calclavia
9527175f0c Fixed some nameless blocks 2014-01-18 01:46:07 +08:00
Calclavia
018e3253a6 Added electric hot plate 2014-01-17 23:11:06 +08:00
Calclavia
db964cda7b Added hot plate smelting 2014-01-17 21:58:05 +08:00
Calclavia
930b89922c Fixed firebox texture direction 2014-01-17 18:10:12 +08:00
Calclavia
eadf578b8f Added fixed gear model 2014-01-17 10:38:41 +08:00
Calclavia
59845d1a0f Added firebox 2014-01-16 22:15:19 +08:00
Calclavia
9835bb5ead Added turntable 2014-01-16 21:43:28 +08:00
Calclavia
4c4423e282 Gears now animate with realistic calculations 2014-01-16 21:01:02 +08:00
Calclavia
5538fda9d4 Gears now rendering 2014-01-16 20:34:43 +08:00
Calclavia
f92d8ad6f8 Added gear renderer 2014-01-16 12:11:28 +08:00
Calclavia
ba53c65e77 Added gear OBJ 2014-01-16 10:40:40 +08:00
Calclavia
0293e7b015 Fixed a lot of texture references 2014-01-15 22:46:48 +08:00
Calclavia
21e10e1af2 Added ability to inverse generator 2014-01-15 21:52:06 +08:00
Calclavia
b6f2d3c503 Got generator working 2014-01-15 21:39:04 +08:00
Calclavia
a87e21103c Fixed some render issues and imprint name 2014-01-15 21:31:29 +08:00
Calclavia
19f7aac383 Added generator model, fixed grate and generator rotation 2014-01-15 20:50:19 +08:00
Calclavia
2107d03c48 Fixed tank z-fighting 2014-01-15 19:45:11 +08:00
Calclavia
e72877cc72 Some more work on gears 2014-01-15 19:08:11 +08:00
Calclavia
6c19f3f394 Cleaned up some more textures 2014-01-15 15:29:33 +08:00
Calclavia
3f08b33359 Added hammer texture 2014-01-15 15:04:56 +08:00
Calclavia
7e6f14a35e Removed unused textures 2014-01-15 15:00:46 +08:00
Calclavia
ffddbbc5e8 Improved Engineering Table texture 2014-01-15 13:36:53 +08:00
Calclavia
5cdf1602bb Fixed tank texture 2014-01-14 22:12:40 +08:00
Calclavia
8744e66d3f Started working on electric generator 2014-01-14 18:20:10 +08:00
Calclavia
0d431b24d3 Fixed crate not having item block 2014-01-14 08:24:34 +08:00
Calclavia
961f6a5f05 Updated crate and engineering table textures 2014-01-14 08:19:29 +08:00
Calclavia
4085313f58 Started on Mechanical Network 2014-01-13 22:04:09 +08:00
Calclavia
f1bd17bd35 Readded Encoder 2014-01-13 21:35:46 +08:00
Calclavia
a5c77aa36c Refactored assets/gui 2014-01-13 21:15:10 +08:00
Calclavia
e24b1571d9 Added new texture for grate 2014-01-13 21:10:13 +08:00
Calclavia
dc803af4e4 Finish tank textures 2014-01-13 20:39:07 +08:00
Calclavia
6d38db4d68 Added tank texture 2014-01-13 18:51:19 +08:00
DarkGuardsman
341da76724 Removed can use method from give command 2014-01-12 23:39:27 -05:00
Vexatos
4e225feb37 Improved dust localization 2014-01-12 12:06:53 +01:00
Calclavia
c180b0cde2 Added .gitignore preventing OBJ from not being uploaded 2014-01-12 17:36:56 +08:00
Calclavia
05f6680df0 Readded detector and rejector 2014-01-12 17:01:49 +08:00
Calclavia
7d286bf468 Readded conveyor manipulator 2014-01-12 16:47:11 +08:00
Calclavia
66f8d8c3df Fixed some tank name issues 2014-01-12 16:04:33 +08:00
Calclavia
00403e800b Added Imprinter 2014-01-12 15:24:19 +08:00
Calclavia
605d4212c5 Added new battery model 2014-01-12 14:38:48 +08:00
Calclavia
518643b438 Added engineering table 2014-01-11 23:43:15 +08:00
Calclavia
699788b19b Fixed some tank derp connections 2014-01-11 23:29:00 +08:00
Calclavia
f3f6d7858b Readded Armbot 2014-01-11 18:31:58 +08:00
Vexatos
5eefcfa051 de_DE.properties edited 2014-01-11 10:17:15 +00:00
Calclavia
99a3827bbd Readded Crates 2014-01-11 13:18:14 +08:00
Calclavia
d62a3e075e Readded Grate and Pump 2014-01-11 13:03:42 +08:00
Calclavia
870a5338ba Readded pipes 2014-01-11 12:51:00 +08:00
Calclavia
08a47e9b3a Removed all pipe textures, we only need white 2014-01-11 12:23:15 +08:00
Calclavia
033f6e4460 Made a copy of all files into Java test directory for safekeeping 2014-01-11 11:31:21 +08:00
Calclavia
7e781c2e6f Renabled Conveyor Belt 2014-01-11 11:28:48 +08:00
Calclavia
ab24bb2746 Added solar panels 2014-01-11 00:08:58 +08:00
Calclavia
03df09471b Merged language files 2014-01-08 21:02:08 +08:00
Calclavia
1a75116926 Refactored assets 2014-01-08 21:01:12 +08:00
Calclavia
9d30da80e7 Moved models out of RI assets folder 2014-01-08 20:54:45 +08:00
DarkGuardsman
db443d5129 Folder change of newly merged content 2014-01-08 07:24:08 -05:00
Calclavia
b5a1f82db6 Added purifier rotor 2014-01-07 21:49:26 +08:00
Calclavia
c4e0a03da8 Removed linker in favor of Calclavia Core's Multitool 2014-01-07 20:52:29 +08:00
Calclavia
60a2b3f9f5 Switched to Gradle system 2014-01-06 22:25:27 +08:00
Calclavia
23223da214 Added grinding sound effect 2014-01-05 19:35:43 +08:00
Calclavia
b9deff12a7 Fixed canGrind crash 2014-01-05 16:02:19 +08:00
Calclavia
474fb6d529 Added grinder wheel 2014-01-05 15:35:42 +08:00
Calclavia
1b4a25fc0b Added fluid mixture 2014-01-05 14:20:01 +08:00
Calclavia
b7dfecb966 Added pick block for BlockBattery 2014-01-05 13:37:55 +08:00
Calclavia
702eda6366 Rendering new battery model 2014-01-05 13:26:34 +08:00
Alex_hawks
bc9171f3f2 Colour works better, and recalculates when the resource pack is reloaded 2014-01-05 11:33:00 +08:00
Alex_hawks
9f436b5f6b And the name is now localized... 2014-01-05 01:10:39 +08:00
Calclavia
dd789c8aca Added machine part block 2014-01-04 22:48:03 +08:00
Calclavia
6579ecb9b0 Some more work on the dust 2014-01-04 14:15:41 +08:00
calclavia
e19a8b9712 Merged in Vexatos/resonant-induction/Vexatos/de_deproperties-edited-1388736572299 (pull request #1)
de_DE.properties edited
2014-01-03 16:57:55 +08:00
Calclavia
1dd2151b9b Added null check to right click framed wire 2014-01-03 16:53:29 +08:00
Vexatos
16c9be1833 de_DE.properties edited 2014-01-03 08:13:40 +00:00
Vexatos
0261df9388 en_US.properties edited 2014-01-03 08:10:16 +00:00
Vexatos
0693ab6802 de_DE.properties edited 2014-01-03 08:09:37 +00:00
Alex_hawks
4005a8f07c Localize ALL the things, and tesla colouring now accepts non-vanilla dyes 2014-01-02 23:51:52 +08:00
Alex_hawks
794656477a Begin Localizing everything 2014-01-02 22:33:04 +08:00
Alex_hawks
0122b481a8 The standalone wires render! :D 2013-12-31 00:43:23 +08:00
Calclavia
7ba0786c0b Starting gradlization 2013-12-26 22:55:47 +08:00