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

303 commits

Author SHA1 Message Date
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
Calclavia
2eec7f95c8 Minor clean up 2013-12-31 02:25:31 +08:00
Calclavia
2ee938dc33 Fixed multimeter's RF detection 2013-12-31 01:59:23 +08:00
Alex_hawks
0122b481a8 The standalone wires render! :D 2013-12-31 00:43:23 +08:00
Calclavia
cb9d7a60cb Made battery store energy 2013-12-31 00:39:23 +08:00
Calclavia
e1a16d4bcd Temporarily disabled OBJ rendering 2013-12-31 00:17:20 +08:00
Calclavia
a12f51ffea Fixed trait path 2013-12-30 23:42:23 +08:00
Calclavia
5bbaae4c24 Readded framed wire multipart code. Semi-functional 2013-12-30 23:29:36 +08:00
Calclavia
b644cd25bc Updated submodules 2013-12-30 23:03:55 +08:00
Calclavia
6acb127517 Readded Calclavia Core 2013-12-30 21:20:28 +08:00
Alex_hawks
5b3002cc3f Create a utility method to make my life easier 2013-12-30 20:52:40 +08:00
Alex_hawks
22eb0f6404 Switch wires now respond to redstone parts in the same tile, and actually drop the lever when broken... 2013-12-30 18:09:35 +08:00
Alex_hawks
b33f13de2c Switch Wires! and finish respecting creative-mode players (don't use/drop items) 2013-12-30 15:07:44 +08:00
Calclavia
eb75c2b7d1 Reduced wire capacitance 2013-12-30 13:00:08 +08:00
DarkGaurdsman
d50b4b3d6f Updated UE api & fixed a bug in the wires 2013-12-29 00:00:44 -05:00
DarkGaurdsman
2c779cda17 Started work on transformer 2013-12-28 23:36:57 -05:00
Alex_hawks
3f4c3cb255 Update to new Calclavia-Core, respect creative-mode players for insulating, and use ore dict for dying, no painters yet... 2013-12-28 18:27:52 +08:00
Calclavia
77d73c5f2f Minor Tesla refactor 2013-12-28 00:31:31 +08:00
Calclavia
c8c0033186 Updated UE network interface 2013-12-27 16:57:42 +08:00
Calclavia
7ba0786c0b Starting gradlization 2013-12-26 22:55:47 +08:00