Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3869 commits 1 branch 0 tags 42 MiB
Commit graph

769 commits

Author SHA1 Message Date
DarkGuardsman
67a4f21dec Started on fluid motor, and hydraulic pressure 2014-01-28 17:11:46 -05:00
DarkGuardsman
a15ed12159 Added some overloads to BlockIOBase 2014-01-28 16:37:11 -05:00
Calclavia
c1e6a6eb6e Added metal caster 2014-01-29 00:18:56 +08:00
Calclavia
a1b0747ba6 Tweaked color generator and molten metals 2014-01-28 23:30:54 +08:00
Calclavia
9a580564fb Added molten textures 2014-01-28 22:53:53 +08:00
Calclavia
22f75bf48d Added dust block and melting dusts into fluids 2014-01-28 22:42:12 +08:00
Calclavia
af4ce9b93c Fixed turntable messing up multipart 2014-01-28 21:08:09 +08:00
Calclavia
4acf402225 Fixed mixture fluids not showing their color 2014-01-28 20:48:19 +08:00
Calclavia
053236fa1f Some fixes to linking 2014-01-28 17:26:40 +08:00
Calclavia
c37abd0ee5 Now only boiling source blocks 2014-01-28 16:17:22 +08:00
Calclavia
f2275bf689 Firebox can now boil water above it into steam 2014-01-28 16:12:10 +08:00
Calclavia
a0ec8a83c0 Fixed setVelocity null point exception 2014-01-28 15:45:23 +08:00
Calclavia
84f2a90c02 Fixed gear shaft inverting rotation 2014-01-28 14:46:38 +08:00
Calclavia
ef4322338e Fixed gear shaft external connections 2014-01-28 14:29:48 +08:00
Calclavia
05b903f07b Fixed gear shaft rendering rotation 2014-01-28 14:11:03 +08:00
Calclavia
17108484f9 Added gear shaft 2014-01-28 13:42:52 +08:00
Calclavia
73ddd6ff18 Added recipes to almost everything 2014-01-28 12:59:33 +08:00
Calclavia
abcbb00280 Added recipes to almost everything 2014-01-28 12:29:51 +08:00
Calclavia
ef6190cf13 Fixed detector texture 2014-01-28 11:54:29 +08:00
Calclavia
8a9ad49d61 Fixed gear not sending packets and disabled encoder 2014-01-28 11:52:19 +08:00
Calclavia
7d468cb614 Improved gear model 2014-01-28 10:46:28 +08:00
Calclavia
ee5c3a773e Fixed #164 - ItemOreResource crash 2014-01-28 10:30:49 +08:00
DarkGuardsman
9f99aefb35 Minor change in turntable vector call 2014-01-27 13:54:14 -05:00
Calclavia
ab3815bd0a Added thermopile 2014-01-28 00:29:33 +08:00
Calclavia
ee0f2d216d Added millstone 2014-01-28 00:00:21 +08:00
Calclavia
5ad8643350 Added dust and refined dust smelting recipes 2014-01-27 23:23:44 +08:00
Calclavia
2e36f323e6 Added manual ore dust washing with cauldron 2014-01-27 23:06:47 +08:00
Calclavia
f69f928cc0 Moved infinite blocks to Calclavia Core 2014-01-27 22:46:48 +08:00
Calclavia
7d2f3ec6d2 Made hammer smashing a "crusher" process 2014-01-27 22:28:45 +08:00
Calclavia
50e1c192f8 Added names to different machine decorative blocks 2014-01-27 22:24:13 +08:00
Calclavia
216dd08bef Moved some prefabs to Calclavia Core 2014-01-27 22:09:56 +08:00
Calclavia
3bf6a6e20a Updated to new GUI base classes 2014-01-27 20:26:25 +08:00
Calclavia
e7cc0f992a Minor tweaks and changes to mixer 2014-01-27 12:57:15 +08:00
Calclavia
9c3700382f Some minor work on the filter 2014-01-27 01:02:16 +08:00
Calclavia
56ab302f0e Finished up large gears! 2014-01-26 20:55:33 +08:00
Calclavia
4fdc27cabe Finished hard core large gear connection logic 2014-01-26 19:51:06 +08:00
Calclavia
4ac678aa00 Large gears are now omni-directional 2014-01-26 16:09:38 +08:00
Calclavia
cca5d6fafe Fixed large gear save and load 2014-01-26 15:47:21 +08:00
Calclavia
fb345993c4 Forgot trait implementation 2014-01-26 00:51:30 +08:00
Calclavia
152051801a Added large gears 2014-01-26 00:50:58 +08:00
Calclavia
497d566bfa Some minor work on the mixer 2014-01-25 22:28:05 +08:00
Calclavia
1c3898bd9e Removed pump for now 2014-01-25 22:12:24 +08:00
Calclavia
733220edef Fixed grate fill algorithm 2014-01-25 22:07:27 +08:00
Calclavia
d91fdcf8fe Optimized drain algorithm to be based off distance 2014-01-25 21:39:15 +08:00
Calclavia
11b8227fea Fixed grate spamming fluid 2014-01-25 20:48:06 +08:00
Calclavia
dcc1a0caf5 Preventing pipe feed back loop 2014-01-25 20:37:25 +08:00
Calclavia
676af2e409 Cleaned up the grate code 2014-01-25 20:25:27 +08:00
Calclavia
99030c23c0 Added mixer and rubble washing 2014-01-25 19:09:50 +08:00
Calclavia
4652c40538 Mixer starting to work 2014-01-25 18:07:08 +08:00
Calclavia
7a5075e323 Fixed conveyor belt not refreshing on world load 2014-01-25 18:01:34 +08:00
Calclavia
4be96d95be Fixed some conveyor belt upward and downward movement 2014-01-25 14:08:55 +08:00
Calclavia
028ff3fc1a Fixed conveyor belt sound and animation 2014-01-25 13:31:17 +08:00
Calclavia
bf574c7c8c Reverted to Java 6 for FTB 2014-01-25 11:34:01 +08:00
Calclavia
f5a055b615 A little work on the mixer 2014-01-25 01:29:47 +08:00
Calclavia
96de7fbdff Updated hot plate textures 2014-01-25 00:30:15 +08:00
Calclavia
f54f3652b5 Added hammer and imprint recipes 2014-01-25 00:07:44 +08:00
Calclavia
de28fb85f6 Reduced grinder poly count 2014-01-24 23:43:38 +08:00
Calclavia
f067577599 Added hammer sound effect 2014-01-24 22:51:05 +08:00
Calclavia
c206e13794 Hammer ores on engineering table to yield rubble 2014-01-24 21:17:15 +08:00
Calclavia
a8e275c73b Reduced amount of gear packets and new grinder sounds 2014-01-24 18:48:53 +08:00
Calclavia
89c32f1744 Grates are now passive and rely on pipe network 2014-01-24 18:20:35 +08:00
Calclavia
38c1e70a59 Fixed some more weird grinder rotations 2014-01-24 18:06:18 +08:00
Calclavia
23cf8da7bb Fixed grinding wheel's render rotation direction being wrong 2014-01-24 18:02:28 +08:00
Calclavia
de2a9a9608 Resolved #131 - Added tons of decoration blocks for monodemono 2014-01-24 17:58:04 +08:00
Calclavia
28e9a9a9ef Generator is now working again 2014-01-24 17:08:50 +08:00
Calclavia
7c3adc4c2b Redesigned mechanical system again to fit rotational conflicts better 2014-01-24 16:34:38 +08:00
Calclavia
65c1dfad7a Grate is now working 2014-01-23 22:50:22 +08:00
Calclavia
0d15854a6f Fixed levitator not rotating 2014-01-23 22:25:46 +08:00
Calclavia
34018f215b Fixed #94 - multimeter gui and redstone output 2014-01-23 22:18:15 +08:00
Calclavia
07d53200d5 Added Armbot disk 2014-01-23 21:47:44 +08:00
Calclavia
d3535903ab Fixed #144 - Armbot multiblock not placing 2014-01-23 21:35:30 +08:00
Calclavia
9d42e9e99d Fixed #145 - Different pipes stacking 2014-01-23 21:29:45 +08:00
Calclavia
0eff1370d3 Fixed #135 - Wire tooltip 2014-01-23 21:28:49 +08:00
Calclavia
6fa2530dd6 Added battery wrench pick up and fixed distribution 2014-01-23 21:22:07 +08:00
Calclavia
0198bd3738 Fixed tesla multiblock issue 2014-01-23 20:37:14 +08:00
Calclavia
10ccaad88c Fixed engineering table z-fighting and only tooltip on sneak 2014-01-23 19:51:54 +08:00
Calclavia
e5449e9566 Made engineering table slightly lower 2014-01-23 18:48:30 +08:00
Calclavia
8219fdfb11 Engineering table now can rotate it's crafting matrix 2014-01-23 18:46:17 +08:00
Calclavia
24079ee908 Started working on engineering table matrix rotation 2014-01-23 16:34:24 +08:00
DarkGuardsman
7da8ac4289 Implemented maxFlow rate in pipe network fill methods 2014-01-21 16:57:12 -05:00
DarkGuardsman
a2a8f8c5e1 Added max pressure and flow rate to pipe network reconstruct 2014-01-21 16:54:25 -05:00
Calclavia
ebeaab6400 Multimeter now tries harder to search for wire networks 2014-01-21 22:38:44 +08:00
Calclavia
4990443e9a Fixed framed wires not connecting 2014-01-21 22:30:49 +08:00
Calclavia
79d22687f6 Fixed multimeter crash 2014-01-21 22:24:02 +08:00
Calclavia
9f9bb3db52 Added battery item renderer 2014-01-21 21:58:58 +08:00
Calclavia
1b072045b9 Wrapped RenderBattery in glMatrix 2014-01-21 21:44:31 +08:00
Calclavia
dee14031be Worked on some battery distribution 2014-01-21 21:20:50 +08:00
Calclavia
833fab1301 Fixed some network rotation and EntityFx crash 2014-01-21 21:09:43 +08:00
Calclavia
27ec5e6de1 Fixed potential multimeter crash 2014-01-21 20:30:08 +08:00
Calclavia
51ed61cb46 Improved battery rendering 2014-01-21 20:29:04 +08:00
Calclavia
be722cc586 Improved grinder direction 2014-01-21 19:52:14 +08:00
Calclavia
a7f19b20a2 Made mechanical network not pathfind unless the amount of generators changed 2014-01-21 19:15:20 +08:00
Calclavia
18ae602065 Added gear disabling upon wrong rotation 2014-01-21 18:37:45 +08:00
Calclavia
5bc0d45912 Finished initial mechanical network packet and rotation system 2014-01-21 18:24:05 +08:00
Calclavia
19ee8e95d0 Fixed some transformer rotations, incomplete 2014-01-21 16:19:32 +08:00
Calclavia
958cca3180 Added new transformer model 2014-01-21 16:06:39 +08:00
Calclavia
3dcd8fdc2f Gears now back to semi-working 2014-01-20 23:22:19 +08:00
Calclavia
f64b157544 Gears now back to semi-working 2014-01-20 23:22:10 +08:00
Calclavia
bc81e18874 New gear rotation calculation algorithm 2014-01-20 22:28:02 +08:00
Calclavia
fea61d5241 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-20 21:37:41 +08:00
DarkGuardsman
80fe74ca4e Removed redstone disable from connection prefab 2014-01-20 08:36:20 -05:00
DarkGuardsman
8011370163 Changed fluid network to use FluidUtility to detect changes when draining tanks 2014-01-20 07:47:32 -05:00
Calclavia
e7cf613339 Added transformer OBJ 2014-01-20 19:18:43 +08:00
Calclavia
3cac78bb60 Updated UE 2014-01-20 19:08:17 +08:00
Calclavia
afd1bbde71 Updated UE 2014-01-20 15:24:50 +08:00
Calclavia
29d55d3aa8 Now adding individual multiparts into network instead of the tile() 2014-01-20 14:29:43 +08:00
Calclavia
c0937c8cdb Minor work on battery renderer 2014-01-20 14:13:41 +08:00
Calclavia
1805ddbbb1 Improved battery render 2014-01-20 12:45:04 +08:00
DarkGuardsman
c1f8082fe4 Re-add Debug blocks 2014-01-19 22:13:51 -05:00
DarkGuardsman
0e901070d7 Minor changes 2014-01-19 21:54:11 -05:00
DarkGuardsman
fc63a8670a Changes for IContentInfo 2014-01-19 21:44:12 -05:00
DarkGuardsman
11e7035c95 Cleared out errors from removing energy prefab 2014-01-19 21:09:32 -05:00
DarkGuardsman
f0538c0ace Cleaned out the old AL prefabs for machines 2014-01-19 20:50:57 -05:00
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
Calclavia
4d3b6e48e4 Gave each RI module a loader 2014-01-08 22:09:27 +08:00
Calclavia
8107bfa21c Added settings class 2014-01-08 21:52:56 +08:00
Calclavia
193eacea96 Some loader refactor 2014-01-08 21:42:52 +08:00
Calclavia
3697ad371a Finished initial merge 2014-01-08 21:34:24 +08:00
Calclavia
0f2a7fad45 Reorganized and refactored half of everything 2014-01-08 21:24:25 +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
Calclavia
00edfac28c Refactored AL package into RI 2014-01-08 20:51:43 +08:00
Calclavia
3e8fe6a4ec Refactored main RI things into core module 2014-01-08 20:49:22 +08:00
DarkGuardsman
db443d5129 Folder change of newly merged content 2014-01-08 07:24:08 -05:00
Calclavia
3badd4a966 Separated into modules 2014-01-08 20:03:25 +08:00
Calclavia
022e0d04af Added getWorld() override for BuildCraft ASM 2014-01-08 14:26:49 +08: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
751d040487 Updated Calclavia Core 2014-01-07 19:08:59 +08:00
DarkGuardsman
4d2e0aaab2 Attempted to fix wires not updating to transformer rotation 2014-01-07 00:29:18 -05:00
DarkGuardsman
4d4c437ac2 Finished transformers complex multi side rotation 2014-01-06 23:33:57 -05:00
Calclavia
2da3f0fdca Forgot a dot in the build version 2014-01-07 08:46:00 +08:00
Calclavia
60a2b3f9f5 Switched to Gradle system 2014-01-06 22:25:27 +08:00
Alex_hawks
b2c3d0d348 oops 2014-01-06 19:52:25 +08:00
Alex_hawks
76ed58c305 MultipartRI is refactor-proof, and move ItemDust 2014-01-06 19:47:27 +08:00
Calclavia
c9bd412bb8 Preventing conflicting wheels to be placed together 2014-01-05 19:50:51 +08:00
Calclavia
9cce3f302e Fixed grinder to separate client and server statics 2014-01-05 19:35:56 +08:00
Calclavia
23223da214 Added grinding sound effect 2014-01-05 19:35:43 +08:00
Calclavia
19d62fac01 Made grinder only grind one at a time 2014-01-05 19:02:49 +08:00
Calclavia
d9a251905d Grinding now working 2014-01-05 18:57:49 +08:00
Calclavia
f467c82f13 Fixed recipe comparisons 2014-01-05 18:33:00 +08:00
Calclavia
7acfada35c Switched to use Java equals() 2014-01-05 17:43:59 +08:00
Calclavia
26a269a6b5 Fixed glitchy item bouncing 2014-01-05 17:28:31 +08:00
Calclavia
b9deff12a7 Fixed canGrind crash 2014-01-05 16:02:19 +08:00
Calclavia
b9eba8778d Updated TileGrinderWheel to new recipe functions 2014-01-05 16:00:36 +08:00
Calclavia
da01b0f37e Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-05 15:58:44 +08:00
Calclavia
cc765887c0 Initial grinder working 2014-01-05 15:58:38 +08:00
Alex_hawks
3a80796832 change the recipe handler, and add a simple get output method 2014-01-05 15:53:29 +08:00
Calclavia
474fb6d529 Added grinder wheel 2014-01-05 15:35:42 +08:00
Calclavia
2357384a8c Refactored Crusher to Grinder 2014-01-05 15:30:30 +08:00
Calclavia
6355b98943 Some more work on fluid 2014-01-05 15:12:33 +08:00
Calclavia
d6df9bb0a3 Added basic fluid merging 2014-01-05 14:50:43 +08:00
Calclavia
ba6a56ab7e Added fluid mixture NBT saving 2014-01-05 14:26:59 +08:00
Calclavia
cfd5359a2f Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-05 14:20:08 +08:00
Calclavia
1b4a25fc0b Added fluid mixture 2014-01-05 14:20:01 +08:00
Alex_hawks
6a8461216d Blacklist for the ore-detection 2014-01-05 14:03:55 +08:00
Calclavia
013c5fb53a Some multimeter refactor 2014-01-05 13:46:07 +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
Calclavia
47f6f07d69 Fixed wire connection not checking canConnect() 2014-01-05 04:26:51 +08:00
Calclavia
f41aa679e8 Registered Machine Part Block 2014-01-05 04:10:47 +08:00
Alex_hawks
3d7328b520 Fix dust auto-generation to require an ore, and no existing dust of the same type 2014-01-05 11:46:01 +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
Alex_hawks
6ba6f5aa23 I forgot that we weren't loading the texture in a Block class 2014-01-05 00:41:08 +08:00
Calclavia
503a2f050c Made dusts render color 2014-01-05 00:13:10 +08:00
Calclavia
118e64b9be Fixed some IO issues 2014-01-05 00:08:39 +08:00
Alex_hawks
f078b765e6 Make it get the colour properly for the dust 2014-01-04 23:57:42 +08:00
Calclavia
cce4db4a9c Refactored EM Levitator 2014-01-04 23:38:19 +08:00
Calclavia
c55ef8eebd Added IO modification support for Battery and Tesla 2014-01-04 23:31:47 +08:00
Calclavia
dd789c8aca Added machine part block 2014-01-04 22:48:03 +08:00
Calclavia
b1cb33932d Added average color computation 2014-01-04 22:38:57 +08:00
Calclavia
6579ecb9b0 Some more work on the dust 2014-01-04 14:15:41 +08:00
Calclavia
1858ea7891 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-04 13:52:16 +08:00
Alex_hawks
6dbfa03cca Changed recipe handler to handle fluids 2014-01-04 21:26:19 +08:00
Calclavia
49e3a67d61 Updated Calclavia Core 2014-01-04 13:51:55 +08:00
Calclavia
457404b6bf Started working on auto-gen ItemDust 2014-01-04 13:18:26 +08:00
Calclavia
a1ac29149c Reorganized packages 2014-01-04 12:04:43 +08:00
Calclavia
0ea073d797 Smoothened out vanilla furnace smelt code 2014-01-04 13:30:46 +08:00
Calclavia
ebc1e90f80 Fixed flat wires casting without check 2014-01-04 00:39:21 +08:00
Calclavia
ed5e0cd1d0 Fixed redistribute calls 2014-01-04 00:24:49 +08:00
Calclavia
4f67cf6b17 Attempt to fix multimeter GUI toggle crash 2014-01-04 00:07:59 +08:00
Calclavia
f6a9cbd5a0 Minor battery fixes 2014-01-03 23:48:47 +08:00
Calclavia
59bf99c105 Got basic battery multiblock structure connecting 2014-01-03 23:42:07 +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
7891ba7640 Fixed another missed-out activate null check 2014-01-03 16:56:37 +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
a0a1d68f7b Framed Switches, and fixes... 2014-01-03 10:43:52 +08:00
Calclavia
86a46fddba Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-03 00:42:10 +08:00
Calclavia
1338b83a02 Fixed framed wire not connecting 2014-01-03 00:42:05 +08: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
Calclavia
4ced4bec81 Switched linker to use VectorWorld 2014-01-02 19:20:39 +08:00
Calclavia
7427f5422e Removed basic component registry 2014-01-01 00:48:01 +08:00
Alex_hawks
4188288032 Recipe Handler Lite™ is mostly done 2013-12-31 16:49:06 +08:00
Calclavia
662837fb3d Fixed wires causing TE conduits to malfunction 2013-12-31 16:30:04 +08:00
Calclavia
77ae252000 MCP doesn't use Java 7 by default 2013-12-31 11:59:55 +08:00