Commit graph

1341 commits

Author SHA1 Message Date
Robert S
d0ead155d3 Setup translation keys for mode setting & modes for tools 2014-05-05 17:16:54 -04:00
Robert S
8ca3070735 Created some basic tool prefabs which includes support for energy & tool modes 2014-05-05 17:14:18 -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
Robert S
990f83d5ce Added toString to several tiles allowing better debug 2014-04-27 15:20:48 -04:00
Robert S
e210232629 Another attempt 2014-04-26 15:57:52 -04:00
Robert S
4ca228ff65 Lets try this and see if it works (dark starts to go crazy) 2014-04-26 15:44:44 -04:00
Robert S
d603344028 Quick file change test 2014-04-26 15:23:11 -04:00
Robert S
0ce70d2d07 Another attempt to fix build issue 2014-04-26 15:15:59 -04:00
Robert S
6fe19c5686 Added waila to each sub mod src folder in attempt to fix build server, need a better way to handle this 2014-04-26 14:55:46 -04:00
Robert S
b34dc134ad Changed api java -> api scala 2014-04-26 13:03:10 -04:00
Robert S
5dcbacb8a0 Added waila src to the api folder to fixed build issues 2014-04-26 12:59:53 -04:00
tgame14
a986e6457d Reworked @Config to support any phase loading 2014-04-21 14:10:05 +03:00
Calclavia
e34ef8e294 Finished mechanical piston render and model 2014-04-18 18:14:40 +08:00
Robert S
4fd8620f2f Created a Inventory version of PartFace mircoblock 2014-04-16 08:12:11 -04:00
Calclavia
41b83362b2 Updated some textures 2014-04-15 21:28:46 +08:00
Calclavia
3df464812d Fixed #522, #513 - Dust water mixture not generating correctly 2014-04-14 20:35:17 +08:00
Robert S
597df343b1 Updated languages submodule 2014-04-14 06:41:12 -04:00
Robert S
ccffd62055 Change solar energy config from long to int 2014-04-10 19:06:47 -04:00
Robert S
a90f300602 Moved power configs to settings class, attempting to fix missing config gen 2014-04-10 17:29:16 -04:00
tgame14
c5368ba283 Added support for any phase loading, This will leave no values unconfigured 2014-04-10 20:57:21 +03:00
tgame14
9b3c87bbb6 Fully Disabling late phase config 2014-04-09 22:36:31 +03:00
tgame14
b9204e859f Temporarily disabling Advanced Late Phase Config handling 2014-04-09 22:26:31 +03:00
tgame14
03551e21a0 Adjusted Resonant Induction to respond to late phase @Config loading 2014-04-09 19:29:35 +03:00
Calclavia
17e065bd22 Updated languages 2014-03-27 21:59:52 +08:00
Robert S
9b86de1bce Moved damage prefabs to core 2014-03-25 14:41:34 -04:00
Calclavia
5cf5b41dc1 Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development
Conflicts:
	src/main/scala/resonantinduction/core/ResonantInduction.java
	src/main/scala/resonantinduction/core/resource/ResourceGenerator.java
2014-03-25 21:10:46 +08:00
Calclavia
bdf8b146ec Added ability to use normal dust as a dust block for smelting 2014-03-25 21:03:45 +08:00
Robert S
e7e2768d19 Fixed block IDs for fluids not showing up in configs 2014-03-25 08:31:51 -04:00
Robert S
ea176da493 Fixed NPE if fluid blockID is null when using a fluid bucket 2014-03-25 08:13:12 -04:00
Robert S
6c93020dea Implemented a few more configs for resource generator 2014-03-25 08:03:40 -04:00
Calclavia
e58c5209d4 Resolved #485 - Refined dust now registers as dust 2014-03-25 19:39:53 +08:00
Robert S
e6d0cc5319 Created a config to disable the ore generator in total 2014-03-25 07:34:42 -04:00
tgame14
de0421dba0 Removing override in fluidpressurenode 2014-03-24 19:15:13 +02:00
Calclavia
cf6d3cdb30 Fixed breaker and placer textures and rotations 2014-03-24 20:49:52 +08:00
Calclavia
90a85e7dcb Moved everything to scala folder 2014-03-23 17:19:47 +08:00
Calclavia
da1164afed Fixed pipes not transfering up and down properly 2014-03-23 10:51:59 +08:00
Calclavia
82382bfd54 Fixed minor tank z-fighting and optimized render 2014-03-22 14:39:34 +08:00
Robert S
620848f4e7 Added basic animation and sound to block breaker 2014-03-22 02:10:17 -04: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
52a00a816f Changed crushing recipes to now be in crusher 2014-03-17 22:56:03 +08:00
Calclavia
3069774a44 Fixed some tank null point exceptions 2014-03-17 22:03:56 +08:00
Calclavia
7bea838a12 Fixed motor wrench rotation and tweaked pipe render 2014-03-17 21:35:32 +08:00
Calclavia
614fe7622d Grate now can be wrenched to not fill higher than itself 2014-03-17 18:28:05 +08:00
Calclavia
d369aa7900 Updated to new MachineRecipes 2014-03-16 13:05:40 +08:00
Calclavia
09810e27de Moved RenderItemOverlayTile 2014-03-15 18:22:04 +08:00
Calclavia
4ed2a4b424 Resource generator now generates only when ore and ingot are present 2014-03-14 18:30:04 +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
e4d704637a Fixed #440 - Filter NPE 2014-03-14 17:37:28 +08:00
Calclavia
ae0012882f Moved all API to Calclavia Core 2014-03-14 17:21:03 +08:00
Calclavia
3f29f38449 Resolved #433 - Added more localizations 2014-03-13 21:15:44 +08:00
Calclavia
7ca7d6f570 Improved tesla shock animation 2014-03-13 21:10:13 +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
2e4de27e94 Filter now renders item it is filter on sides 2014-03-12 21:07:10 +08:00
Calclavia
8f14af4bb7 Resolved #432, #317 - Wind turbines now can be powered to blow items 2014-03-12 19:52:16 +08:00
Calclavia
edff518b72 Fixed IMechanicalNode dependent on MechanicalNode 2014-03-12 18:50:04 +08:00
Calclavia
747c851a8c Node now uses INode interface 2014-03-12 18:22:31 +08:00
Calclavia
f05e01cac1 Resolved #429 - Missing localization 2014-03-12 17:46:23 +08:00
Calclavia
90c6e6d4d7 Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development 2014-03-12 17:05:37 +08:00
Calclavia
931ef14708 Updated localizations 2014-03-12 17:05:31 +08:00
Alex_hawks
38ee016c37 Untested fluid support for RecipeHandlers... 2014-03-11 23:26:46 +08:00
Calclavia
60f13cabe8 Fixed potential grid thread deadlock 2014-03-11 22:18:56 +08:00
Calclavia
5d10f1412f Resolved #404 - Added OreDict recipe config 2014-03-11 22:09:18 +08:00
Calclavia
79e9fc8f6d Fixed ItemOreResource dependent on TileGutter 2014-03-11 22:01:39 +08:00
Calclavia
ced69ff4ee Reduced the amount of packets sent by fluid nodes 2014-03-11 21:32:13 +08:00
Calclavia
1afcb6ae3d Fixed pipe max pressure material incorrect 2014-03-11 21:15:59 +08:00
Calclavia
e03aec6950 Fixed grate not filling world with gravity 2014-03-11 20:36:45 +08:00
Calclavia
59e5c5cf10 Fixed Resonant Induction not ticking client side 2014-03-11 20:29:32 +08:00
Calclavia
57f362dff2 Fixed gutter rendering extra beams 2014-03-11 20:14:39 +08:00
Calclavia
1e0492eb53 Fixed #409 - Gutter bucket fill and drain 2014-03-11 19:30:07 +08:00
Calclavia
acbf1ccbbc #403 - Temporarily disabled Engineering table autocraft 2014-03-11 22:17:32 +08:00
Calclavia
749d84648f Fixed block and item ID config not loading 2014-03-11 21:45:31 +08:00
Calclavia
34c6b75057 Added NodeRegistry 2014-03-11 21:10:13 +08:00
Calclavia
0bc9aab4ca Fixed #405 - Dusts not falling 2014-03-11 20:43:00 +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
tgame14
1a2165dea2 Converted Resonant Induction settings to new Configuration System 2014-03-09 15:35:02 +02:00
Calclavia
e5dcc4d5c0 Temporarily switched to non-threaded ticker for MC 1.6 2014-03-10 06:29:04 +08:00
Calclavia
45207ae2bb Quantum gates now transport fluids! 2014-03-10 06:22:37 +08:00
Calclavia
1c6aa00f43 Quantum gates now work between dimensions 2014-03-10 04:50:33 +08:00
Calclavia
a14d9b9dc2 Fixed gutter z-fighting 2014-03-10 03:15:26 +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
Calclavia
9fa649312a Fixed #398 - Concurrent modification during grid reconstruction 2014-03-08 14:29:09 -08:00
Calclavia
b51029e578 Implemented gutter gravity system 2014-03-08 14:12:17 -08:00
Calclavia
33df875a9b Fixed fluid system tentatively 2014-03-08 13:44:21 -08:00
Calclavia
b94e8aaf17 Updated Calclavia Core 2014-03-08 13:10:03 -08:00
Calclavia
148152fc71 Fixed inability to inherit twice, changed INodeProvider interface 2014-03-08 11:52:03 -08:00
Calclavia
5888877b0d Engineering table can be configured to not autocraft 2014-03-08 10:55:31 -08:00
Calclavia
c029993500 Unfinished errored work on nodes 2014-03-08 00:40:02 -08:00
Calclavia
27bc8b9e47 Fixed #390 - Threaded grid not running client side 2014-03-07 22:15:33 -08:00
Calclavia
2771f34350 Fixed #391 - NodeGrid concurrent modification 2014-03-07 21:58:36 -08:00
Calclavia
53f833b094 Fixed #396 - Dust block place on wall material bug 2014-03-07 21:52:59 -08:00
Calclavia
59336384f8 Temporarily removed errors 2014-03-07 18:24:19 +08:00
Calclavia
be889b7064 Some incomplete work on pressure nodes 2014-03-06 17:26:27 +08:00
Calclavia
8131256e08 Gutter now uses new block registration system 2014-03-06 16:55:32 +08:00
Calclavia
a42f273420 Added PressureNode for fluid network 2014-03-06 16:33:54 +08:00
Calclavia
d811141896 Some network tweaks 2014-03-06 11:35:54 +08:00
Calclavia
1cef920e62 Made thread pause during main menu 2014-03-05 23:04:28 +08:00
Calclavia
a15631c4fb Mechanical network is now multithreaded 2014-03-05 22:17:47 +08:00
Calclavia
81c71391bf Resolved #380 - Added chance for manual ore washing to fail 2014-03-05 21:36:00 +08:00
Calclavia
aa10031979 Fixed generator not working 2014-03-05 21:35:29 +08:00
Calclavia
f4fc1a7910 Resolved #385 - Tanks now emit light 2014-03-05 20:45:14 +08:00
Calclavia
61aec43d44 Finished new node grid 2014-03-05 19:37:24 +08:00
Calclavia
f90c513986 Fixed mechanical grid not adding new nodes 2014-03-05 17:41:08 +08:00
Calclavia
571f571d4d Signing off with some incomplete attempt on mechanical multithreading 2014-03-04 23:03:47 +08:00
Calclavia
dacf725587 A lot more work on new grid design 2014-03-04 22:26:01 +08:00
Calclavia
503c3a9904 Finished basic mechanical grid 2014-03-04 21:40:03 +08:00
Calclavia
ff152d1009 Rewrote structure of mechanical grid 2014-03-04 20:37:55 +08:00
Calclavia
b369e77b9f Removed all the unused GUI 2014-03-04 20:07:34 +08:00
Calclavia
ef692bbd63 Fixed #378 - Archaic tier generating 4 ingots 2014-03-04 17:28:25 +08:00
Calclavia
a7a5743c4b Fixed #360 - Generator not checking mechanical node sides 2014-03-03 22:36:19 +08:00
Calclavia
7f490b260a Finished the initial sorter 2014-03-03 22:15:25 +08:00
Calclavia
4b919ed7e3 Removed RIBlockRenderingHandler 2014-03-03 20:57:22 +08:00
Calclavia
56c75b56dd Added sorter, not working yet 2014-03-03 20:52:34 +08:00
Calclavia
87c1cdde97 Ore dust can now be washed in gutters 2014-03-02 16:03:55 +08:00
Calclavia
e7d75e3795 Resolved #343 - Different material water turbines now have different stats 2014-03-02 12:24:26 +08:00
Calclavia
c6ac81c6a6 Revived gutters 2014-03-01 20:26:18 +08:00
Calclavia
fee28407d8 Fluids in tank now have smooth animation 2014-03-01 18:57:46 +08:00
Calclavia
a353e01840 Rewrote tank distribution network 2014-03-01 12:43:01 +08:00
Calclavia
6dcdd50437 Some fixes for gutter 2014-02-28 23:38:46 +08:00
Calclavia
dad66a5f62 Added colored pipes 2014-02-28 22:47:11 +08:00
Calclavia
d28bbbdeb4 Moved tank to Archaic tier 2014-02-28 21:56:11 +08:00
Calclavia
a9c445c140 Fixed #333 - A couple of typos 2014-02-28 21:18:04 +08:00
Calclavia
26490a561b Fixed #331 - Laser API metadata 2014-02-28 21:16:04 +08:00
Calclavia
84629a846a Filters can now take imprints and leak items through 2014-02-28 21:11:59 +08:00
Calclavia
fde9a63f78 Some more minor turbine tweaks 2014-02-28 20:47:20 +08:00
Calclavia
d8350d3fae Added stone and metal water turbines 2014-02-28 11:25:51 +08:00
Calclavia
b8e1661a84 Added stone and metal wind turbines 2014-02-28 10:18:09 +08:00
Calclavia
6c5f2f5ecb Fixed NPE and some connections in network
s
2014-02-28 10:01:30 +08:00
Calclavia
bebde23242 Fixed #328 - Bucket fluid name NPE 2014-02-28 08:23:30 +08:00
Calclavia
bd37a0999b Mechanical network optimization and caching connections 2014-02-27 23:00:38 +08:00
Calclavia
a41cb4998f Fixed fluid names with other mods 2014-02-27 20:57:56 +08:00
Calclavia
16500fb538 Removed "constantly adding network" 2014-02-27 20:31:57 +08:00
Calclavia
4d2e7a10f6 Added turbine creative builder and tweaked wind turbine attributes 2014-02-27 19:11:44 +08:00
Calclavia
2892fd9b9b Fixed #311 - Fixed mixer results from other mods 2014-02-27 16:40:39 +08:00
Calclavia
7720a9a753 Resolved #235 - Engineering table now drops with NBT 2014-02-27 16:16:04 +08:00
Calclavia
fd58124f78 Fixed #325 - Forgot to register ResourceGenerator 2014-02-27 15:40:31 +08:00
Calclavia
900b597e89 Fixed dust drop and firebox melt time 2014-02-26 20:43:57 +08:00
Calclavia
3d6d6b889a Fixed molten bucket giving out mixture fluids 2014-02-26 17:59:37 +08:00
Calclavia
d19c676d27 Revert "Renamed core module to Archaic module"
This reverts commit 1f0e208bbd.
2014-02-26 17:18:49 +08:00
Calclavia
1f0e208bbd Renamed core module to Archaic module 2014-02-26 17:00:15 +08:00
Calclavia
2821f7b1e1 Added mechanical piston 2014-02-26 15:31:00 +08:00
Calclavia
015868fba6 Moved hand crank to Archaic tier 2014-02-26 14:43:19 +08:00
Calclavia
a384b3e4c6 Resolved #297 - Moved resources into new creative tab 2014-02-26 14:35:52 +08:00
Calclavia
14131914b3 Fixed #293 - Hand crank causing inability to make large gears 2014-02-26 14:02:25 +08:00
Calclavia
74d1609640 Fixed custom fluids having no texture or color 2014-02-26 13:31:04 +08:00
Calclavia
19d44c1840 Fixed inactive pipe network and pump not extracting 2014-02-26 12:59:18 +08:00
Calclavia
1c56fba9bc Fixed some resource generator and liquid issues 2014-02-26 12:32:33 +08:00
Calclavia
143e6d00e7 Resolved #298 - Added bucket for all fluids 2014-02-26 11:55:37 +08:00
Calclavia
f16e2387c3 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-02-26 09:45:09 +08:00
Calclavia
9807e49499 Changed some textures 2014-02-26 09:44:49 +08:00
Robert Seifert
15b398ac3b Fixed gear shafts of different types stacking 2014-02-25 17:40:13 -05:00
Robert Seifert
1291d760c7 Implemented vanilla block recipes for grinder 2014-02-25 17:27:30 -05:00
Robert Seifert
2c9966c632 Created a quick Fluid Bucket item class 2014-02-25 16:51:04 -05:00
Calclavia
a3dc5bf994 Resolved #288 - Hand crank! 2014-02-26 01:04:16 +08:00
Calclavia
49e790e667 Engineering table now can auto-craft 2014-02-26 00:53:49 +08:00
Calclavia
beb453df1e Fixed crash between fluid names and ore dict names 2014-02-26 00:33:46 +08:00
Calclavia
ef506bf88e Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-02-25 23:39:17 +08:00
Alex_hawks
728e5a6dd7 Transfer Rects now work 2014-02-25 23:36:51 +08:00
Calclavia
f96ee359b2 Millstone and gear now requires hand crank 2014-02-25 23:22:30 +08:00
Calclavia
47b845a67a Fixed solar panel and thermopile texture 2014-02-25 22:59:57 +08:00
Calclavia
a2338c043a Filters now work with gutters 2014-02-25 22:45:50 +08:00
Calclavia
7ba79db7d7 Finished initial gutter 2014-02-25 22:31:05 +08:00
Calclavia
1442b683c7 Fixed render and block bounds for gutter 2014-02-25 21:05:37 +08:00
Calclavia
500eca7ea6 Some filter and wire IC2 compatibility fixes 2014-02-25 21:05:10 +08:00
Calclavia
2712e54a8f Fixed major fluid recipe comparison bug 2014-02-25 18:48:33 +08:00
Calclavia
988e85bf42 Added lava as casting recipe 2014-02-25 18:38:34 +08:00
Calclavia
cc92a5e29b Renamed caster into casting mold 2014-02-25 18:25:06 +08:00
Calclavia
98d4ba7dbb Fixed caster render translation 2014-02-25 08:41:36 +08:00
Calclavia
fe06c08414 Added new model for metal cast 2014-02-25 08:39:05 +08:00
Calclavia
53dc0957fe Fixed #286 - Resource Generator not disable config not working 2014-02-25 08:24:59 +08:00
Calclavia
c122eaec05 Fixed #282 - Connector loop concurrent modification 2014-02-25 08:23:07 +08:00
Calclavia
cbbe4ecb5e Initial work on Quantum Gate 2014-02-24 22:54:52 +08:00
Calclavia
ca9e694a68 Fixed multiple fluid in network conflict 2014-02-24 21:32:15 +08:00
Calclavia
3c4808bb6c Fixed #264 - Now hiding fluid blocks from NEI 2014-02-24 21:05:46 +08:00
Calclavia
0166ed66fa Fixed #274 - Pipe break texture 2014-02-24 20:48:04 +08:00
Calclavia
5118106f9d Fixed #268 - Recipe issues 2014-02-24 20:40:58 +08:00
Calclavia
1ab181ff3f Optimized pipe packets 2014-02-24 20:25:30 +08:00
Calclavia
2b5b496e56 Fixed grate cause game freeze during block search phase 2014-02-24 19:40:50 +08:00
Calclavia
59601d27bb Fixed #279 - Added block and item ID prefix in config 2014-02-24 18:23:18 +08:00
Calclavia
442f21b377 Attempt to add NEI back as dependency 2014-02-24 18:00:44 +08:00
Calclavia
d3dca5ba03 Fixed #276 - Wire breaking returning copper 2014-02-24 14:18:14 +08:00
Calclavia
6465b40bb4 New grate texture 2014-02-24 14:17:59 +08:00
Calclavia
3b137cfca7 Some pipe fixes and added gravity pressure 2014-02-23 22:57:35 +08:00
Calclavia
f0eed8c32f Pipe now renders fluid inside of it 2014-02-23 22:14:04 +08:00
Calclavia
e431807bc1 Added pressure detection to multimeter 2014-02-23 22:06:17 +08:00
Calclavia
8b4afcac8c Added pump and new pressure fluid system 2014-02-23 21:59:52 +08:00
Calclavia
72bb31bcbf Turbine model improvements 2014-02-23 21:35:29 +08:00