tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3796 commits 2 branches 0 tags 102 MiB
Commit graph

1253 commits

Author SHA1 Message Date
aidancbrady 866c76bafe Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes 2016-03-05 13:17:58 -05:00
aidancbrady 668643e663 Entangloporters work perfectly! 2016-03-04 21:58:13 -05:00
aidancbrady f8f8dfa737 More work on entangloporters 2016-03-04 13:14:48 -05:00
aidancbrady c03b712ed2 More work. I'm gonna let the configuration component determine send/receive instead of cluttering the GUI more 2016-03-04 12:07:34 -05:00
aidancbrady ad15e359ac Work on Quantum Entangloporters. I get the feeling this is gonna be a big project 2016-03-04 11:06:05 -05:00
aidancbrady cfb0986a48 Added fancy graphs to display boil rate and max boil value of boilers, boiler valves now connect to corresponding tanks of multiblock based on location 2016-03-01 13:37:19 -05:00
aidancbrady 382116b659 Hopefully final build fix 2016-03-01 10:29:43 -05:00
aidancbrady 30fbfc32d6 Another try 2016-03-01 10:26:57 -05:00
aidancbrady 8b9098b350 Another build fix attempt 2016-03-01 10:25:06 -05:00
aidancbrady 4644e75202 Work on boiler stats panel, hopefully fix build 2016-03-01 10:22:24 -05:00
aidancbrady 1071f2fb4d Adjusted numbers, everything is now nice and balanced 2016-02-29 00:31:19 -05:00
aidancbrady f09010a927 Many more fixes 2016-02-28 19:11:43 -05:00
aidancbrady 7c160cc264 Interface and rendering fixes 2016-02-28 18:11:50 -05:00
aidancbrady c0f465d0cb Boiler rendering and interface, still yet to do statistics 2016-02-28 16:44:05 -05:00
aidancbrady 2451ac4819 Completed merge 2016-02-28 12:32:36 -05:00
aidancbrady 3d43a96f91 Merge branch 'master' into development 
* master:
  Fixed Induction Matrix issue
 2016-02-28 12:31:34 -05:00
aidancbrady 9d43e4ab49 Fixed Induction Matrix issue 2016-02-28 12:31:27 -05:00
aidancbrady 155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady 9b9ed0a4c0 Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly) 2016-02-27 01:27:26 -05:00
aidancbrady 63335a57c8 Resistive heater is just about done! 2016-02-26 20:44:21 -05:00
aidancbrady 9d55f6cc8a Lots of work on resistive heaters, still mostly unfinished 2016-02-26 19:51:37 -05:00
aidancbrady baf3ae6f59 Update build number 2016-02-26 14:30:49 -05:00
aidancbrady d6f6625d83 A bit of work on resistive heaters 2016-02-26 09:28:19 -05:00
aidancbrady b3143d1abb Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system 2016-02-24 20:29:50 -05:00
aidancbrady 2d972edf45 Work on boilers 2016-02-24 17:42:12 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
aidancbrady c9f0ed0941 Fix forestry sapling integration 2016-02-20 11:33:45 -05:00
aidancbrady d72f4b6181 Don't mine fluid blocks 2016-02-20 11:25:38 -05:00
aidancbrady 0f59e722e1 Use Forge handlers for jetpack/scuba tank display bar instead of item damage 2016-02-20 11:07:54 -05:00
aidancbrady 279cccaa9b Merge branch 'development' into v9 
* development:
  Fixed chunk boundary acceptor interaction
 2016-02-19 18:09:14 -05:00
aidancbrady 7e9aa46fe3 Fixed chunk boundary acceptor interaction 2016-02-19 18:09:03 -05:00
aidancbrady 1ca263813a Compressed resources now provide 8 uses instead of 10 2016-02-18 18:52:17 -05:00
aidancbrady 84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05:00
aidancbrady 4d60d234f3 Added recipes for boiler crafting elements, lessened copper requirements of Solar Evaporation Plant* 
*still need to rename to Thermal Evaporation Plant
 2016-02-18 18:15:39 -05:00
aidancbrady 78c0453225 Merge branch 'development' into v9 
* development:
  Fixed Digital Miner redstone slot interaction
 2016-02-15 20:28:28 -05:00
aidancbrady cde76479ab Fixed Digital Miner redstone slot interaction 2016-02-15 18:41:23 -05:00
aidancbrady ff9bbdfde8 More boiler work 2016-02-13 18:59:42 -05:00
aidancbrady 3a2eeac52d Add multiblock creation algorithm for boiler 2016-02-11 19:35:02 -05:00
aidancbrady e23409e2a5 Move Pressure Disperser to main module; going to be shared by both turbine and boiler 2016-02-10 18:30:16 -05:00
aidancbrady 269cd2b406 Refactored Basic Block to use enum-based block types instead of the messy way things were done before 
Also:
- Worked on preliminary boiler code and assets
- Added tooltips to certain basic blocks
Todo: move pressure disperser from generators to main module
 2016-02-09 00:28:52 -05:00
aidancbrady 2bea8ac29a Work on Thermodynamic Conductors 2016-02-03 11:08:36 -05:00
aidancbrady f19a8f9e64 Tooltip auto-scaling! All tooltips now have equal widths, even in different languages. 2016-02-03 00:37:39 -05:00
aidancbrady 22bf688fbd Muffling Upgrades! Mute individual machine volumes. 2016-02-02 22:55:26 -05:00
aidancbrady 203890ca88 Redesigned Solar Evaporation Controller to dynamically update heat instead of the simple linear algorithm used before 
- Plant height determines overall rate of temperature change, rate of processing
- Biomes determine base temperature of plants, meaning a desert could process small amounts of brine on its own
- Rate of heat decay exponentially increases as heat increases, meaning large amounts of heat are needed to greatly increase temperature
- System of heat management designed for integration with heat API in near future
 2016-02-02 21:39:37 -05:00
aidancbrady 345feedf70 Remove ItemAttacher 2016-01-30 08:19:58 -07:00
aidancbrady de7bff08d5 Fixed inventory transition 2016-01-29 22:12:51 -07:00
aidancbrady 5aaea55900 Infusing Factories. They're finally here 2016-01-29 21:13:05 -07:00
aidancbrady 88cfee2ab2 Changed Metallurgic Infuser infuse system to use icons for textures 2016-01-29 17:47:41 -07:00
aidancbrady 06dc2227f2 A few ejector fixes 2016-01-28 23:45:22 -07:00
aidancbrady a22b33a629 Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output 2016-01-29 00:34:50 -05:00
aidancbrady 0a135a6936 Loads of changes to Electric Pump, Fluidic Plenisher and Transmitters 
- Electric Pumps are now more efficient, upgradable, and have new config options, one of which prevents sucking of water sources (true by default)
- Fluidic Plenishers are now upgradable
- Transmitters can be upgraded by being right-clicked by alloys normally involved in crafting-based upgrading
 2016-01-28 20:38:32 -05:00
aidancbrady b9d064dc06 Cleanup 2016-01-26 08:38:00 -05:00
aidancbrady b450e7e408 Turbine fixes. They're just about polished 2016-01-26 08:10:36 -05:00
aidancbrady 47b06cd577 More fixes, added recipes for turbine components 2016-01-25 11:58:32 -05:00
aidancbrady d210f6c47c Interface fixes 2016-01-25 00:29:28 -05:00
aidancbrady 2984bf45a8 Loads of untested work on turbine interface 2016-01-25 00:13:42 -05:00
aidancbrady afe8969c37 Added energy management to turbine and turbine valves 2016-01-23 00:40:30 -05:00
aidancbrady 769a8fd480 Multiblock protocol works, begin turbine tile code 2016-01-22 23:46:16 -05:00
aidancbrady 9cbc96a88e Textures for turbine components! Still need to texture turbine structure blocks. 2016-01-22 19:36:39 -05:00
aidancbrady 8cab2ebe8c Rename Turbine Rod to Turbine Rotor, work on multiblock form code 2016-01-22 17:22:20 -05:00
aidancbrady 0c025e1033 Structural Glass is now real, started on core turbine multiblock code 2016-01-22 15:41:34 -05:00
aidancbrady 6e9ee32df1 Turbines now render and look fancy, fixed some multiblock code 2016-01-21 20:36:40 -05:00
aidancbrady 51c9ca061c Merge branch 'development' into v9 
* development:
  Use apache library
 2016-01-19 14:41:25 -05:00
aidancbrady dc7f5cfc9b Merge branch 'master' into development 
* master:
  Use apache library
 2016-01-19 14:41:13 -05:00
aidancbrady bfd32a1c3e Use apache library 2016-01-19 14:41:05 -05:00
aidancbrady bc57033fb9 Merge branch 'development' into v9 
* development:
  Fix a small transporter bug
 2016-01-18 17:18:24 -05:00
aidancbrady 17425b998f Merge branch 'master' into development 
* master:
  Fix a small transporter bug
 2016-01-18 17:18:12 -05:00
aidancbrady 1540cd2230 Fix a small transporter bug 2016-01-18 17:18:05 -05:00
aidancbrady 4c2b470213 Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine 2016-01-17 15:59:02 -05:00
aidancbrady c1c15ae707 Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods 2016-01-16 11:29:37 -05:00
aidancbrady 2a78265419 Changed name of boiler to fix conflicts 2016-01-13 18:02:47 -05:00
aidancbrady 3f158d26da Fixed cable crash 2016-01-13 17:00:25 -05:00
aidancbrady c03c7e0f7a Fixed Reactor Port not accepting items 2016-01-13 16:21:08 -05:00
aidancbrady 0efbd28c8f Updated Box Blacklist parser to be more intuitive 2016-01-13 16:08:14 -05:00
aidancbrady e950c645e7 Fixed Solar Evaporation Plant memory leaks 2016-01-13 10:53:16 -05:00
aidancbrady a8efb3b0de Better Solar Evaporation Plant algorithm- much less CPU intensive and fixes all the weird building bugs 2016-01-13 00:10:13 -05:00
aidancbrady 0e1a08474c Removed test recipe registration 2016-01-12 18:48:35 -05:00
aidancbrady 9b3969f1ff Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes 2016-01-12 18:41:15 -05:00
aidancbrady ab5fe0c819 Fixed IMC recipe deletion 2016-01-11 21:13:36 -05:00
aidancbrady 0b984148b4 Fixed blocks not being harvested by items with one damage level 2016-01-11 21:00:32 -05:00
aidancbrady a72e043947 WAILA bounding block support 2016-01-11 20:55:16 -05:00
aidancbrady 72193075ab More efficient transporter tree searching 2016-01-11 20:45:13 -05:00
aidancbrady b6306d0779 More sound fixes 2016-01-09 13:37:37 -05:00
aidancbrady 4d65942f11 Server hotfix 2016-01-09 10:07:22 -05:00
aidancbrady 99fc98faf5 Fixed HolidayManager 2016-01-08 12:24:27 -05:00
aidancbrady faf63dfebc Updated readme, improved Electric Pump calculation 2016-01-08 00:40:37 -05:00
aidancbrady 7016268cbc Better redstone support, fixed fuse sound 2016-01-05 20:35:42 -05:00
aidancbrady 8728531f77 Add short parsing to PacketHandler 2016-01-05 15:35:36 -05:00
aidancbrady f9681a9942 Quick lib fix 2016-01-04 18:13:46 -05:00
aidancbrady 08eb8be841 A few necessary library additions 2016-01-04 00:33:00 -05:00
aidancbrady 3ff2ede090 Updated Electrolytic Separator internals to support redstone control 2015-12-31 14:55:49 -05:00
aidancbrady bd3bc4402f Fix Metallurgic Infuser upgrade slot conflict 2015-12-31 14:25:26 -05:00
aidancbrady a71b6bda01 Adjustable Flamethrower modes - combat, heat, and inferno 2015-11-28 08:58:26 -07:00
aidancbrady f88a97697f Fixed Gas Tank comparator support 2015-11-27 23:29:55 -07:00
aidancbrady 21fa9fdb26 Cleaned up computer integration 2015-11-27 23:19:29 -07:00
aidancbrady c2006d5e70 Computer integration fixes 2015-11-27 23:04:43 -07:00
aidancbrady a4ab830e79 Cleanup, added Redstone Logic Adapter OC support 2015-11-27 22:04:39 -07:00
aidancbrady fbd692b4e0 Fixed transporter tier calculations 2015-11-27 12:30:49 -07:00
aidancbrady f5c48f60e6 Teleport now specifies orientation, closes #2977 2015-11-27 10:41:45 -07:00
aidancbrady 6466463a63 Bumped version 2015-11-26 15:44:42 -07:00
aidancbrady 2b785c95f3 Transmitters now intelligently maintain buffers when transmitter nodes are destroyed 2015-11-26 15:41:22 -07:00
aidancbrady b248cf4b07 Fixed fluid/gas duplication 2015-11-26 14:40:46 -07:00
aidancbrady f6154e2cb3 Fixed sorter not behaving nicely with double chests 2015-11-26 13:39:46 -07:00
aidancbrady de839808d7 Improved chemical machines side config 2015-11-26 10:39:36 -07:00
aidancbrady a14b0d77ad Fixed Induction Matrix computer integration 2015-11-25 10:34:49 -07:00
aidancbrady 79483d1fa7 Merge branch 'master' into development 2015-11-25 10:10:04 -07:00
aidancbrady 40f7373819 Fixed a small crash 2015-11-25 08:48:05 -07:00
aidancbrady ef6d62294d Cleanup 2015-11-25 08:43:08 -07:00
aidancbrady 57eaa5d154 Fixed a small bin issue 2015-11-20 10:41:36 -05:00
Tim Stableford ef62f57836 Fix for CC peripherals always throwing error. 2015-11-06 18:31:27 +00:00
Shadowfacts 4e87e281c9 Force the player's experience to sync when changing dimensions 
(Thank you, @Gebatzens)

Fixes #2943

Also add misc IDEA files to .gitignore
 2015-09-06 13:23:19 -04:00
Ben Spiers 4040a57a16 Oops 2015-07-28 18:53:29 +01:00
Ben Spiers 9a3f0ae633 Version Number Update: 8.1.7 2015-07-28 18:46:00 +01:00
Ben Spiers 51f1c68f05 Fix Sided Inventories with the logistical sorter 2015-07-28 18:26:17 +01:00
Ben Spiers c9f51bd970 Update some MekanismUtils functions to use Coord4D 2015-07-28 04:58:04 +01:00
Yip Rui Fung 9cb67fa054 Fix StackSearcher using variable side before initializing it. Fixes #2844 2015-07-26 15:24:59 +08:00
Yip Rui Fung 4bf799e37d Fix AE2 P2P registration. 2015-07-25 10:20:06 +08:00
Yip Rui Fung 766f0d5302 Fix bin crash when interacting with empty hand. 2015-07-25 08:59:25 +08:00
ruifung d9cc8fe157 Register transmitter items with AE2 P2P 
So the respective transmitters can be used to attune a AE2 P2P bus.

Please tell me if I'm missing anything on the mekanism side.
 2015-07-23 18:23:56 +08:00
Ben Spiers 53d8522d42 Make a change to prevent networks leaking on chunk unload. 
It seems to have fixed the broken pipe issue as well, please test.
 2015-07-21 20:45:06 +01:00
aidancbrady 7323a13e09 Support for custom localizations, closes #2626 2015-07-20 18:48:45 -07:00
aidancbrady 9a9f77af87 Fixed a few balloon issues 2015-07-20 14:26:55 -07:00
aidancbrady c7fe1f86eb Cleaner CC support with a separate peripheral handler 2015-07-20 12:28:18 -07:00
aidancbrady ee709cc202 New computer integration for the rest of Mekanism machinery 2015-07-20 11:43:49 -07:00
aidancbrady a94c13edc7 Implement new computer framework in primary machines 2015-07-20 11:09:44 -07:00
aidancbrady a062ea5e9e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-20 10:53:18 -07:00
aidancbrady d39536d89c Cool new factory textures (thanks @Radviger), also a (temporarily unused) OC layer. Does this look good @Vexatos? 2015-07-20 10:53:12 -07:00
Ben Spiers 41492f5d28 Add a FakePlayer op commands. 2015-07-19 23:31:56 +01:00
Ben Spiers d5f5565694 Make the logistical sorter skip unplaceable stacks 
Java could really do with generators/yield semantics.
 2015-07-19 01:16:46 +01:00
Ben Spiers d994f18117 Fix Railcraft engine compatibility. 
For some reason they're not IEnergyProviders.
 2015-07-18 21:53:19 +01:00
aidancbrady a2fb334833 IMC-based recipe removal. Wiki is updated as well :) 2015-07-14 15:59:55 -07:00
aidancbrady 6bda8addcb Accept power from ForgeDirection.UNKNOWN 2015-07-14 14:30:51 -07:00
aidancbrady 7799afed53 Go ahead and bump Forge to latest recommended, 1291 is looking too old 2015-07-14 14:22:27 -07:00
Aidan b743618186 Merge pull request #2805 from halvors/fix/get-pick-block 
Update getPickBlock() to use the new non-deprecated version.
 2015-07-08 09:28:44 -07:00
Halvor Lyche Strandvoll 037e1e553f Update getPickBlock() to use the new non-deprecated version. 2015-07-08 12:34:02 +02:00
aidancbrady 87b7b838f0 Induction Matrix now caps input based on provider transfer cap, displays input rate data in both main and stats interfaces 2015-07-06 13:55:40 -07:00
aidancbrady b01f31a65e Added framework for restricted EIM input, improved & cleaned up CC integration 2015-07-06 13:38:08 -07:00
aidancbrady 19ccc2c025 Added CC integration to Laser Amplifiers 2015-07-06 08:44:43 -07:00
aidancbrady e86df43477 Configurable gas storage capacities for flamethrower, jetpack & scuba tank 2015-06-30 15:01:14 -07:00
aidancbrady 8fb0209a11 Added new crusher BioFuel recipes 2015-06-30 14:54:04 -07:00
aidancbrady 77db81bcf0 Added fake player readout, closes #2771 2015-06-29 10:45:39 -07:00
aidancbrady d879ffc066 Fixed FuelHandler crash 2015-06-29 10:30:52 -07:00
aidancbrady 7607a135ce Bump version to 8.1.6 2015-06-23 15:20:03 -07:00
aidancbrady 7a538cb76e Added clay/brick convenience recipe 2015-06-23 15:18:10 -07:00
aidancbrady 13f27b6732 Electrolytic Separators are now super server friendly 2015-06-17 16:29:25 -04:00
aidancbrady 43b71cb8cc Attempt another Dynamic Tank fix 2015-06-17 15:54:01 -04:00
aidancbrady 6bdbb41b2d Attempt a packet log check 2015-06-17 15:30:52 -04:00
aidancbrady ace9dec4df Better packet logging, specifically for the more CPU intensive packets 2015-06-17 15:17:09 -04:00
aidancbrady 838ad33756 Packet logging 2015-06-17 15:04:07 -04:00
aidancbrady c67bbde36a Fixed Balloon render on player entities 2015-06-17 13:53:30 -04:00
aidancbrady b9f80c0365 Dynamic Tanks are now server friendly, closes #2690 2015-06-17 13:26:47 -04:00
aidancbrady 81511d3800 Doubled base Solar Evaporation Plant processing rate and added config property, double check transporter paths to prevent bad calculations 2015-06-16 20:42:46 -04:00
aidancbrady 42ce42aee2 Moved debug reference to MekanismAPI, fixed RC recipe 2015-06-15 12:39:48 -04:00
aidancbrady 96034259ac Lowered Solar Evaporation Plant heat loss 2015-06-13 21:26:26 -04:00
aidancbrady b2be7ffe42 Fixed Universal Cable IC2 interaction, Solar Evaporation Plants now cool down half as fast as they did previously, also continue to operate with internal heat at night 2015-06-13 12:39:23 -04:00
aidancbrady ebe48abd84 Crash fix 2015-06-13 11:39:09 -04:00
aidancbrady aec238dde5 Version bump, improved Rotary Condensentrator crafting recipe, made Solar Evaporation Controller use new gauge standards 2015-06-11 19:59:19 -04:00
aidancbrady e12dd2597c Hopefully fix a small DM issue 2015-06-06 20:47:12 -04:00
aidancbrady 3df1750f82 Stacked Electric Chests can now open 2015-06-05 10:08:15 -04:00
aidancbrady f5979e26bc Fixed Purification Chamber issue 2015-06-05 09:56:21 -04:00
aidancbrady 55407e43a9 Added a config entry allowing operators to bypass restrictions 2015-06-05 09:47:59 -04:00
aidancbrady 08de0ba743 Fixed a small inventory bug 2015-06-04 01:17:49 -04:00
aidancbrady 3cd05489d9 Bump version to 8.1.4 2015-05-29 23:19:43 -04:00
aidancbrady 6b765d27e7 Fixed inject usage of Chemical Dissolution Chamber 2015-05-28 16:48:58 -04:00
aidancbrady c2f7735115 Fixed a Bin issue 2015-05-28 16:43:01 -04:00
aidancbrady 1b41d04b93 Prevent bins from stacking 2015-05-28 16:39:57 -04:00
aidancbrady 18c0159680 Removed CLR buttons from chemical processing machines in favor of new gauge dropper functionality 2015-05-28 16:34:25 -04:00
aidancbrady 917430bf5c You can now dump any tank by shift-clicking its gauge with a gauge dropper 2015-05-28 16:27:06 -04:00
aidancbrady b6264891f1 Fixed a small Gas Generator crash 2015-05-28 16:22:00 -04:00
aidancbrady f95bfbb600 Fix console spam, we don't really need that anyway 2015-05-28 10:32:05 -04:00
aidancbrady 95565b38c3 Added Heavy Water Bucket! 2015-05-23 11:59:43 -04:00
aidancbrady 654bce3c7d Fixed advanced machine item input logic 2015-05-23 11:44:19 -04:00
aidancbrady 4613dcb55f Implemented BuildCraft style of dummy player, integrated with BlockEvent.BreakEvent in Digital Miner and Laser logic 2015-05-23 11:36:53 -04:00
aidancbrady 384bf643e0 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-05-22 13:06:51 -04:00
aidancbrady fa71836e0d Fixed bad cast, fixed tubes and pipes losing capacity after world load 2015-05-22 13:06:46 -04:00
tterrag1098 b70c0e015f Remove hard dep on unnecessarily new forge version 2015-05-13 17:18:21 -04:00
aidancbrady 0b04665055 Another fluid tank fix 2015-05-11 10:42:58 -04:00
aidancbrady 1377ec88e8 Fixed circuit OreDict implementation 2015-05-10 19:45:09 -04:00
aidancbrady 6a25667b20 Added property to prevent world damage by flamethrowers & lasers 2015-05-10 19:33:28 -04:00
aidancbrady 909e80ff77 Fixed a transporter crash, don't scale Electrolytic Separator energy usage 2015-05-10 19:20:36 -04:00
aidancbrady 9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
aidancbrady 1c8c12ee88 Fixed a small Dynamic Tank bug 2015-05-09 18:12:41 -04:00
aidancbrady c62e27d5fd Configurable armored jetpack resistance values, quadrupled brine production rate of SE plants 2015-05-06 08:34:04 -04:00
aidancbrady 3185f1bf22 Bumped version to 8.1.3 2015-05-05 10:45:59 -04:00
aidancbrady a32d6f4953 A few fixes 2015-04-28 08:24:54 -07:00
aidancbrady 33ff01b436 Fixed transporters 2015-04-27 11:09:20 -07:00
aidancbrady 281836fc4a Revert "Oops, forgot to update the miner inventory slots" 
This reverts commit 93a1789053.
 2015-04-26 19:41:10 -07:00
aidancbrady c839ce5697 Revert "Changes to GUI's for more flexibility & consistancy" 
This reverts commit 61406c2b2d.
 2015-04-26 19:41:03 -07:00
aidancbrady 2cbcaf0a3b Added Podzol recipe 2015-04-26 19:39:02 -07:00
aidancbrady abce650fd4 Maybe fix bad transporters 2015-04-26 12:44:46 -07:00
aidancbrady b44f7a999b Fixed Digital Miner starting on world load 2015-04-26 12:24:49 -07:00
Aidan Brady 8030b0e057 Fixed icons, bumped Mekanism version to 8.1.2, bumped Forge to 1395, updated CB libraries 2015-04-25 13:14:10 -07:00
TehStoneMan f8d6993f0f Merge remote-tracking branch 'upstream/development' into development 2015-04-24 11:02:08 +10:00
TehStoneMan 93a1789053 Oops, forgot to update the miner inventory slots 2015-04-24 10:58:38 +10:00
TehStoneMan 61406c2b2d Changes to GUI's for more flexibility & consistancy 
First stage of changing GUI's to add flexibility to elements, and
consistancy of visual design. Not all devices have been updated yet.
 2015-04-24 00:14:03 +10:00
RAWRwins254 746ed3f5d7 Fixing NPE from EnergyAcceptorWrapper.java not handling ticks that aren't related to a TileEntity. 2015-04-23 01:46:04 -05:00
Ben Spiers 5baf4605e0 Fix FluidStack now being amount-specific in its hashCode() method. 2015-04-17 18:29:57 +01:00
Ben Spiers e6ee804686 Update forge again. 2015-04-17 18:27:41 +01:00
Ben Spiers 0919a82484 Merge branch 'master' into development 2015-04-17 18:01:03 +01:00
Ben Spiers d8c26c3ed0 Hopefully fix some RF problems with pseudo-acceptors. 2015-04-17 17:44:02 +01:00
emperor06 447e81c1be Added ComputerCraft support to Induction Matrix. 2015-04-16 17:35:48 +02:00
Aidan C. Brady 308233720c Temporary fix for multiple buffer type merges 2015-04-15 12:52:07 -04:00
Aidan C. Brady 2c53ce6956 Configurator's "empty" mode now only works on Mekanism container blocks 2015-04-15 12:44:52 -04:00
Aidan C. Brady 425f0c27c3 Prevent crash when creating EnergyAcceptorWrapper 2015-04-14 10:55:38 -04:00
Aidan C. Brady 33f19cf895 Fixed a crash 2015-04-13 08:43:08 -04:00
Aidan C. Brady 9d76df996c Tiny cleanup 2015-04-13 08:19:36 -04:00
Aidan C. Brady da661af41c Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2015-04-12 17:16:21 -04:00
Aidan C. Brady f89f3c1aaa Fixed hash code assignment 2015-04-12 17:16:16 -04:00
Ben Spiers 03e45cc401 Back to Forge 1291. 
Turns out I do silly things when I'm tired...
 2015-04-12 03:38:33 +01:00
Ben Spiers 866abf5c8d Fix build. 2015-04-12 00:38:28 +01:00
Ben Spiers 13221b5bf3 Remove some unused methods. 2015-04-12 00:12:18 +01:00
Ben Spiers d73eed2865 Fix the draining issue 2015-04-12 00:09:35 +01:00
Ben Spiers 17e1cea25a Possible fix for EnergyNet weirdness. 2015-04-11 14:27:21 +01:00
Ben Spiers 420e1619e6 Clean up some TransporterPathfinder stuff. 2015-04-10 23:55:59 +01:00
Ben Spiers 7b4404a973 Remove an unused parameter. 2015-04-10 23:55:59 +01:00
Ben Spiers 91d323ccdd Maybe fix negative buffer issues . 2015-04-10 23:55:59 +01:00
Ben Spiers 05508b598a Fix non-overworld dimensions. 2015-04-10 19:21:34 +01:00
Ben Spiers cb95cfeedd Fix ITubeConnection acceptors that aren't IGasHandler 2015-04-10 18:39:06 +01:00
Aidan C. Brady 5fec517a6d Crash fix 2015-04-10 08:34:02 -04:00
Aidan C. Brady 174509444b Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-04-10 08:24:34 -04:00
Aidan C. Brady a03ef85f4c Fixed compile, bumped version to 8.1.1 2015-04-10 08:24:28 -04:00
Ben Spiers 94189a4f61 Fix Transporters with multipart. 2015-04-09 02:39:23 +01:00
Ben Spiers 4ca9456de8 Use path score to sort paths, not length. 2015-04-09 02:39:23 +01:00
Ben Spiers 36f0607d5e Prioritise faster paths, by making cost inversely proportional to speed. 2015-04-09 02:39:23 +01:00
Aidan C. Brady 068e4b58a7 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-04-07 10:42:50 -04:00
Aidan C. Brady 12ebfe6745 ThreadSparkle is now operated in main client thread time - new safety checks will prevent serious lag anyway 2015-04-07 10:41:17 -04:00
Ben Spiers 4a2dde8f87 Fix API, put back some methods that GC uses, optimise imports in API. 2015-04-06 18:53:16 +01:00
Aidan C. Brady 034d732e15 A bit more tidying 2015-04-06 11:10:57 -04:00
Aidan C. Brady ec7b0555c9 Cleanup 2015-04-06 11:08:57 -04:00
Aidan 841e358ce0 Merge pull request #2478 from aidancbrady/networkRefactor 
Network Refactor
 2015-04-06 11:00:45 -04:00
Ben Spiers f4a6fb8274 Do some things I TODOed earlier 2015-04-06 04:32:47 +01:00
Ben Spiers d70595ad84 Fix a last few issues, and stop leaking networks on the client 2015-04-06 04:11:08 +01:00
TehStoneMan f74acdfca6 Updated Digital Miner GUI 
Updates to the Digital Miner config GUI to match changes to Logistical
Sorter GUI
 2015-04-06 11:38:21 +10:00
Ben Spiers c13b3b240f Fix some bugs with LogiTransporters 2015-04-06 02:18:45 +01:00
Ben Spiers 16ce88f09a Restore some client-side network stuff. More fixes 2015-04-06 01:29:07 +01:00
TehStoneMan 293b8c08f1 Sorting buttons now work 
Got the sorting buttons to work. Clicking on the arrow buttons on a
filter panel will now move that filter up or down in the filter list.
Without having made any changed to how filters are processed, filters
higher in the list will naturally be processed before later filters,
thereby making it like a priority system.
For example, if an item matches two filters, the higher priority filter
will take that item before the lower filter, in that way seperating a
specific item from a broader (wildcard) specified filter.
 2015-04-05 23:03:56 +10:00
Ben Spiers ede0015eec Merge branch 'development' into networkRefactor 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2015-04-04 02:58:26 +01:00
Ben Spiers d29d1580bb Fix some stuff I missed in the merge, and server-client communication. 2015-04-04 02:44:14 +01:00
Aidan C. Brady 41cfed37b7 Fixed a few crashes 2015-04-03 20:21:05 -04:00
Ben Spiers 7a2461540f Merge branch 'development' into networkRefactor. 
Hopefully I didn't miss anything

Conflicts:
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/client/render/RenderPartTransmitter.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/InventoryNetwork.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
	src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
	src/main/java/mekanism/common/multipart/PartPressurizedTube.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/PipeUtils.java
 2015-04-03 19:45:25 +01:00
Ben Spiers 29659ad2cd Fix some client/server stuff, and fluid networks 2015-04-03 18:04:56 +01:00
Aidan C. Brady 8d38f63f5f Bumped version to 8.1.0 2015-04-01 23:09:27 -04:00
Ben Spiers d14686ea2e Work on clientsiding, acceptors and things like redstone and multipart blocking. 2015-04-02 03:22:53 +01:00
Aidan C. Brady 45895cb753 Configurable values for Mekanism tier-related properties 2015-04-01 11:06:27 -04:00
Aidan C. Brady dc0a90921a A few crash fixes 2015-04-01 09:06:23 -04:00
Ben Spiers 47b4eb28b4 Start on refactor of entire network system. 
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it.
We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well.
Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
 2015-04-01 02:42:36 +01:00
Aidan C. Brady fe8cc9d1e0 Tiered Pressurized Tubes, better tooltips, better transmitter icons 2015-03-31 17:46:09 -04:00
Aidan C. Brady 1438d601e3 Better Mechanical Pipe textures 2015-03-31 13:44:57 -04:00
Aidan C. Brady a5db67e2b7 Tiered Logistical Transporters 2015-03-31 11:39:10 -04:00