Commit graph

870 commits

Author SHA1 Message Date
DarkGuardsman
1fb19b287a Change engineer table to use an empty hand for crafting 2014-01-19 18:37:30 -05:00
DarkGuardsman
38c4be95fd Changed wire tool tip 2014-01-19 17:48:12 -05:00
Calclavia
2b7d873e5a Added new battery model 2014-01-19 23:12:40 +08:00
Calclavia
ef478755b1 Clean up 2014-01-19 21:03:03 +08:00
Calclavia
2bbc93b70a Fixed generator direction and creative battery 2014-01-19 20:54:36 +08:00
Calclavia
a3122c7e0f Fixed battery tiers 2014-01-19 20:19:58 +08:00
Calclavia
06a9c10788 Fixed grinding wheel roatations 2014-01-19 20:11:29 +08:00
Calclavia
0fd99fa04e Gears now work all 6 sides 2014-01-19 19:46:07 +08:00
Calclavia
a0bbaee12b Fixed minor tank packet bug 2014-01-19 19:30:00 +08:00
Calclavia
bd496c66bd Finished pipe system and fixed tanks 2014-01-19 19:20:57 +08:00
Calclavia
8436dd5b41 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-19 17:53:32 +08:00
Calclavia
d5859ba566 Finished multipart pipes 2014-01-19 17:53:26 +08:00
DarkGuardsman
199b8515e5 Buff solar panel from 5j to 25j a tick 2014-01-19 04:46:19 -05:00
Calclavia
62be2b5b1d Merged release valve with the tank 2014-01-19 17:25:43 +08:00
Calclavia
db4af58b2b Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-19 17:01:41 +08:00
Calclavia
32404e6742 Pipes are now multipart 2014-01-19 17:01:35 +08:00
DarkGuardsman
6d3c60097f Increased solar cells from 1j to 5j a tick 2014-01-19 03:36:34 -05:00
DarkGuardsman
85136fb62c Fixed BatteryBox charge cap tiering 2014-01-19 03:28:45 -05:00
DarkGuardsman
3c36d162e0 Fixed ItemBlockBattery meta issue 2014-01-19 03:28:18 -05:00
Calclavia
c90d509d5e Got tanks almost working 2014-01-19 15:14:20 +08:00
DarkGuardsman
ff0dbfe5ad Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-19 01:47:31 -05:00
DarkGuardsman
1ab4bd3a3f Worked on generator rotation logic 2014-01-19 01:46:27 -05:00
Calclavia
0f977d5b8a Fixed tank not working when only one block 2014-01-19 14:44:34 +08:00
Calclavia
20dcbce5c5 Added clockwise set and get methods for IMechanical 2014-01-19 14:20:41 +08:00
Calclavia
1e5319c4de Made items render flat on hot plate and engineering table 2014-01-19 14:18:05 +08:00
Calclavia
e7e19b6afd Grinder now works with mechanical network 2014-01-19 13:49:42 +08:00
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
e8623ff70f Tweaked battery balance 2014-01-19 12:16:15 +08:00
Calclavia
1b17e38217 Tesla now uses new multiblock library 2014-01-19 02:13:17 +08:00
Calclavia
ba212e9d29 Changed framed wire to use shift-right-click 2014-01-18 19:23:08 +08:00
Calclavia
946e54253f Fixed item crate subtypes 2014-01-18 19:14:16 +08:00
Calclavia
011f9b64fa Reduced volume of grinder 2014-01-18 18:36:48 +08:00
Calclavia
d4868e1815 Fixed slant connection and made items fly off belts if too fast 2014-01-18 18:22:34 +08:00
Calclavia
a202737f48 Added rubble and refined dust 2014-01-18 17:41:10 +08:00
Calclavia
812131c2c0 Added recipes for items in Archaic module 2014-01-18 17:32:44 +08:00
Calclavia
93fbc7e0ce Finished turntable and fixed grate rotation issues 2014-01-18 16:28:00 +08:00
Calclavia
0666f18a8a Engineering table now searches adjacent inventories for resources 2014-01-18 16:00:13 +08:00
Calclavia
0f25136871 Manipulator now works 2014-01-18 15:43:47 +08:00
Calclavia
e6970bc083 Minor packet and NBT bug fix 2014-01-18 15:17:59 +08:00
Calclavia
1ba081a992 Flat wires now receive energy from attachment 2014-01-18 15:08:47 +08:00
Calclavia
1b01df9e72 Conveyor belts now work as part of mechanical network 2014-01-18 15:08:12 +08:00
Calclavia
8cab946411 Added mechanical resistance 2014-01-18 13:29:19 +08:00
Calclavia
2cfd22a8d3 Added load calculation mechanic 2014-01-18 13:22:37 +08:00
Calclavia
a5c124eeac Added ability to change torque to velocity ratio in generator 2014-01-18 12:43:41 +08:00
Calclavia
883930a1bf Made mechanical network packets more efficient 2014-01-18 12:36:31 +08:00
Calclavia
5c3601585d Some more work on mechanical network 2014-01-18 10:17:44 +08:00
Calclavia
22b4188443 Generators can now produce mechanical energy 2014-01-18 02:07:56 +08:00
Calclavia
9527175f0c Fixed some nameless blocks 2014-01-18 01:46:07 +08:00
Calclavia
e8e8042241 Finished initial system for mechanical network 2014-01-18 01:33:37 +08:00
Calclavia
018e3253a6 Added electric hot plate 2014-01-17 23:11:06 +08:00
Calclavia
c38290a920 Added hot plate stack size cache preventing smelt time cheat 2014-01-17 22:37:56 +08:00
Calclavia
cd593898a3 Fixed some minor hot plate issues 2014-01-17 22:29:23 +08:00
Calclavia
db964cda7b Added hot plate smelting 2014-01-17 21:58:05 +08:00
Calclavia
024873067f Fixed battery not registering item form 2014-01-17 20:26:05 +08:00
Calclavia
f18837cb9f Unified inventory interaction actions 2014-01-17 20:19:52 +08:00
Calclavia
3a04133f96 Firebox now works 2014-01-17 19:49:40 +08:00
DarkGuardsman
61dbe025b2 Fixed Archaic module not loading config 2014-01-17 06:25:38 -05: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
102db7356d Gears now work omni-directional 2014-01-16 21:32:30 +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
DarkGuardsman
b53678a432 Attempted to fix pipe network filling tanks 2014-01-15 12:07:25 -05:00
DarkGuardsman
ec0c06dc48 Fixed fluid rendering on players head 2014-01-15 10:31:34 -05: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
11aa32154c Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-15 21:31:36 +08:00
Calclavia
a87e21103c Fixed some render issues and imprint name 2014-01-15 21:31:29 +08:00
DarkGuardsman
29d9f58213 Removed print line from network classes 2014-01-15 08:24:57 -05:00
Calclavia
4054079fb6 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-15 21:23:23 +08:00
Calclavia
6e0bcfccd3 Moved all renderers to new render system 2014-01-15 21:23:17 +08:00
DarkGuardsman
8213d6e80b Fixed fluid lose issue in tanks 2014-01-15 08:15:13 -05:00
Calclavia
c1f3dcc75e Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-15 21:13:45 +08:00
Calclavia
0a4428c940 Using new renderer system 2014-01-15 21:13:34 +08:00
DarkGuardsman
29b59d88e0 Fixed tank network and improved fluid network 2014-01-15 08:08:24 -05:00
Calclavia
19f7aac383 Added generator model, fixed grate and generator rotation 2014-01-15 20:50:19 +08:00
Calclavia
cfddbc97ab Fixed wire texture 2014-01-15 20:04:02 +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
DarkGuardsman
351cfca349 Attempt to fix a few network issues with tanks & pipes 2014-01-14 17:43:13 -05:00
DarkGuardsman
afcc1318d6 Worked on a few fluid devices, and moved some models to their packages 2014-01-14 16:47:14 -05:00
DarkGuardsman
531095a9d2 Re-add release valve and fixed a few network issues 2014-01-14 16:16:47 -05:00
DarkGuardsman
06dd77d2cc Re-added pipe network connection map 2014-01-14 15:25:19 -05:00
DarkGuardsman
95ce03ee48 More work on mechanical networks 2014-01-14 15:13:39 -05:00
DarkGuardsman
026ecfff34 Changed mech network a little 2014-01-14 13:56:58 -05:00
Calclavia
2b0094ae6b Added multipart gears and basic gear logic 2014-01-14 22:35:50 +08:00
Calclavia
5cdf1602bb Fixed tank texture 2014-01-14 22:12:40 +08:00
Calclavia
053a62f358 Finished merging DarkLib into Resonant Induction 2014-01-14 18:24:35 +08:00
Calclavia
8744e66d3f Started working on electric generator 2014-01-14 18:20:10 +08:00
DarkGuardsman
67df03b32e Fixed tank network 2014-01-14 05:03:19 -05:00
DarkGuardsman
b7c711f8c5 Worked on tank network re-adding fluid balancing code 2014-01-14 04:23:37 -05:00
DarkGuardsman
2ba673c5ad Re-add pipe gauge and removed old versions 2014-01-14 03:13:01 -05: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
c2d5a12930 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-13 21:10:19 +08:00
Calclavia
e24b1571d9 Added new texture for grate 2014-01-13 21:10:13 +08:00
DarkGuardsman
1bc51d43ba Fixed a crash and re-add pipe gauge 2014-01-13 07:55:46 -05:00
Calclavia
150267acc6 Fixed some minor tank render issues 2014-01-13 20:47:05 +08:00
Calclavia
180f8b91dc Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-13 20:39:15 +08:00
Calclavia
dc803af4e4 Finish tank textures 2014-01-13 20:39:07 +08:00
DarkGuardsman
7f2cb49736 Added drain code to FluidNetwork 2014-01-13 07:22:01 -05:00
Calclavia
96c5b39192 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-13 19:56:31 +08:00
Calclavia
3048d94f7a Some work on new tank renderer 2014-01-13 19:56:22 +08:00
DarkGuardsman
1438e5eda7 Settup fluid network building 2014-01-13 06:53:19 -05:00
Calclavia
6d38db4d68 Added tank texture 2014-01-13 18:51:19 +08:00
DarkGuardsman
c5335008ec Cleared out errors but pipes & tanks don't work just yet 2014-01-13 01:24:58 -05:00
DarkGuardsman
329429ae3b Updated most things to use the new network code 2014-01-13 01:13:23 -05:00
DarkGuardsman
6002f9d744 Update release valve to new network intefaces 2014-01-13 00:19:44 -05:00
DarkGuardsman
2945a120ef Started on new fluid network interfaces 2014-01-13 00:19:02 -05:00
DarkGuardsman
c192cfdf54 Removed can pass threw and on pass threw from fluid parts 2014-01-12 23:42:42 -05:00
DarkGuardsman
341da76724 Removed can use method from give command 2014-01-12 23:39:27 -05:00
DarkGuardsman
7eeefe396e Fixed multiblock and fluid block not using config file 2014-01-12 21:52:09 -05:00
Calclavia
30505e0eb9 Tweaked wire resistance class 2014-01-12 21:54:21 +08: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
DarkGuardsman
31f0d1f208 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-12 03:27:04 -05:00
DarkGuardsman
186ca49c64 Fixed tank renderer 2014-01-12 03:26:44 -05:00
Calclavia
f9e10fe1cf Got imprinter working 2014-01-12 16:24:15 +08:00
Calclavia
66f8d8c3df Fixed some tank name issues 2014-01-12 16:04:33 +08:00
DarkGuardsman
a9b373e639 Fixed pipe & tank placement issue 2014-01-12 02:40:36 -05:00
Calclavia
2f8eff86dd Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-12 15:24:47 +08:00
Calclavia
00403e800b Added Imprinter 2014-01-12 15:24:19 +08:00
DarkGuardsman
bca0fbdbaf Fixed a few issues with pipe renders 2014-01-12 02:23:57 -05:00
Calclavia
605d4212c5 Added new battery model 2014-01-12 14:38:48 +08:00
Calclavia
a54e0d066a Added engineering table filter/blueprint support 2014-01-12 13:54:53 +08:00
Calclavia
d860d672d1 Removed useless container 2014-01-12 13:48:49 +08:00
Calclavia
57800e0e0f Engineering table now reaps resources from your inventory 2014-01-12 13:48:26 +08:00
Calclavia
f581ade242 Fixed stackSize tooltip being "1" and added inventory clear method 2014-01-12 13:07:18 +08:00
Calclavia
05241e740e Added ability to mass craft with Engineering Table 2014-01-12 12:37:58 +08:00
Calclavia
8c7e8d7601 Added crafting tooltips 2014-01-12 01:15:43 +08:00
Calclavia
d1315fb585 Finsihed engineering table 2014-01-12 01:03:30 +08:00
Calclavia
f073591ec8 Engineering table render and item placing working 2014-01-12 00:43:19 +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
a884d59309 Fixed more tank packet issues 2014-01-11 23:20:18 +08:00
Calclavia
77ae26235a Fixed pipe packet and using bitmasks 2014-01-11 22:49:21 +08:00
Calclavia
b41c1ce033 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-11 22:27:33 +08:00
DarkGuardsman
de54ac908c Try two on fixing config 2014-01-11 06:38:15 -05:00
DarkGuardsman
9771db804c Possible fix for config issues 2014-01-11 06:16:34 -05:00
Calclavia
58e7179a36 Some work on Tank bitmask 2014-01-11 19:14:28 +08:00
DarkGuardsman
0747c2ffad Moved tank prefabs 2014-01-11 06:13:50 -05:00
DarkGuardsman
7706d5bd65 Found and re-added Tank & Pipe item renderers 2014-01-11 05:48:25 -05:00
Calclavia
f3f6d7858b Readded Armbot 2014-01-11 18:31:58 +08:00
Calclavia
a31b12ba30 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-11 18:20:24 +08:00
Calclavia
9f53320123 Using new block registration 2014-01-11 18:19:26 +08:00
Vexatos
5eefcfa051 de_DE.properties edited 2014-01-11 10:17:15 +00:00
Calclavia
51ae09aa3b Refactored crafting table and imprinter 2014-01-11 17:56:26 +08:00
Calclavia
f4d88b0efc Moved archive out of test folder 2014-01-11 17:44:07 +08:00
Calclavia
d362bab7c4 Removed IPowerless 2014-01-11 17:30:24 +08:00
Calclavia
e8b0e56a80 Moved more stuff to core 2014-01-11 17:28:38 +08:00
Calclavia
68e9b95ffb Moved some of stuff into core 2014-01-11 17:22:03 +08:00
Calclavia
6b1766fc3b Purged all errors! 2014-01-11 13:59:55 +08: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
904461936f Readded tanks 2014-01-11 12:09:02 +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
eab51b61cc Fixed EMLevitator 2014-01-11 11:04:30 +08:00
Calclavia
0f2ab328f9 Fixed vanilla texture not loading 2014-01-11 00:15:40 +08:00
Calclavia
ab24bb2746 Added solar panels 2014-01-11 00:08:58 +08:00
Calclavia
67fc891420 Fixed dust colors too dark 2014-01-10 23:20:38 +08:00
Calclavia
ede36bfead Fixed errors in Armbot 2014-01-10 22:39:03 +08:00
Calclavia
660288b230 Moved appropriate classes to Electrical module 2014-01-10 22:06:56 +08:00
Calclavia
dc950d7989 Using new ID registration system 2014-01-10 20:24:33 +08:00
Calclavia
b78d5d1c8e Updated Calclavia Core 2014-01-10 19:11:31 +08:00
Calclavia
662acb7c23 Moved some of Dark Library into Calclavia Core 2014-01-10 17:38:29 +08:00
Calclavia
dc63af95fb Fixed proxy, Minecraft now loading again 2014-01-10 16:57:49 +08:00
DarkGuardsman
dfabc9e1d8 Little bit of work 2014-01-10 03:00:46 -05:00
DarkGuardsman
d7c536211e Moved a few things 2014-01-09 18:40:49 -05:00
Calclavia
b20537b0a4 Readded electrical module 2014-01-09 23:08:22 +08:00
Calclavia
c5ed109d97 Some work done on the dust generator 2014-01-09 22:52:37 +08:00
Calclavia
3aaeb5d3d3 Got dust auto-generating 2014-01-09 21:59:28 +08:00
Calclavia
ea7c34e467 Minecraft now at least loads up 2014-01-09 20:54:02 +08:00
Calclavia
8f99dd32ae Moved all files to old and starting to recode and organize everything 2014-01-09 20:49:52 +08:00
Calclavia
9b8cad0ab3 Moved Built Broken library into RI 2014-01-09 20:35:05 +08:00
DarkGuardsman
363ce7ad11 More error correction 2014-01-09 01:15:16 -05:00
DarkGuardsman
c0e93e23b3 More work on cleanup & correction of classes 2014-01-08 21:23:16 -05:00
DarkGuardsman
bb781a6685 Working on cleanup 2014-01-08 18:55:59 -05:00
Calclavia
84a023c66c More organization 2014-01-08 22:44:19 +08:00
Calclavia
b8fecae832 More refactor and clean up 2014-01-08 22:27:39 +08:00
Calclavia
27107a8ba1 Reorganized imports and format 2014-01-08 22:18:24 +08:00