Commit graph

1255 commits

Author SHA1 Message Date
Maxwolf Goodliffe 3da711f20e Merge pull request #2 from Universal-Electricity/development
Massive refactoring, merged Atomic Science into Resonant Induction as At...
2014-05-14 18:30:32 -07:00
Maxwolf Goodliffe 893d1ff628 Massive refactoring, merged Atomic Science into Resonant Induction as Atomic module. All language files merged also! 2014-05-14 09:10:15 -07:00
Calclavia a8d5820fdf Removed language submodule 2014-05-14 16:34:22 -07:00
Calclavia d02e11b729 Updated languages 2014-05-14 16:33:56 -07:00
Robert WC Seifert a3bf294ab5 Merge pull request #1 from Universal-Electricity/development
Development
2014-05-14 05:42:22 -04:00
Robert S 7615acc605 Updated to use Resonant-Engine as the core mod 2014-05-14 01:32:00 -04:00
tgame14 a57b5fafe8 removed unneeded event listener 2014-05-11 18:03:38 +03:00
Robert S 4de939dcff Updated lang submodule 2014-05-06 01:28:15 -04:00
Robert S 738a673bef Minor lang key change for laser gun 2014-05-06 01:01:48 -04:00
Robert S aa7e8fdde7 Fixed sync issues with laser when discharging its battery 2014-05-05 22:29:17 -04:00
Robert S ecf0ea78ac Increased laser charge up delay to 20ticks 2014-05-05 17:41:13 -04:00
Robert S bace43ead9 Laser gun now consumes energy per tick, also increase cost from 1j to 100j 2014-05-05 17:37:35 -04:00
Robert S 8b2c78ea3e Fixed energy tools using battery boxes capacity tiering 2014-05-05 17:31:46 -04:00
Robert S 7644aadf80 More work on tool prefabs, setup energy tiers, stack limits, and item settings 2014-05-05 17:26:08 -04:00
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