Commit Graph
3188 Commits
Author SHA1 Message Date
Thiakil c195cd6bbb null pointer fix for #5388 2019-04-13 11:54:40 +08:00
Dave Smith 8bc38d47a7 Avoid scheduling a sound to be played if it's fully muffled. (#5386)
* Avoid scheduling a sound to be played if it's fully muffled.

* Remove debug message
2019-04-12 12:50:54 -04:00
Richard Freimer da71637053 Port ToMe25's PR for sawing factories (#5383)
* Port remainder of #5327 implementing #5236 sawing factories

* Add missing blockstate files for sawing factories

* Inline helper method

* Revert a bit of minor formatting changes to make dif easier to read

* remove redundant mcmeta for sawing front textures

* de-dupe sawmill factory textures (left+right are the same)
2019-04-12 10:22:16 -04:00
pupnewfster a1b32906b2 Slightly change the wording of the MultiblockFormParticles 2019-04-12 00:46:01 -04:00
Dave Smith f828afb786 Add support for left/right alignment of HUD; improve contrast by using a light color (#5385) 2019-04-12 00:20:34 -04:00
Xander 8a468d0c78 Gradle merge (#5382)
Gradle changes to restore CI build/release ability
2019-04-12 10:53:06 +08:00
pupnewfster fcef0e2ed4 Fix logistical transporters attempting to connect to chargepads 2019-04-11 11:21:00 -04:00
pupnewfster 8a0382877a Port first part of #5327 implementing #4688 disable free runners while sneaking
Credits to @ToMe25
2019-04-11 11:15:15 -04:00
temp1011 7ae0a4d5ca port tesr pull (#5380)
Logistical Sorter & Chargepad TESR to model improvements
2019-04-11 20:27:46 +08:00
pupnewfster d6a0d989e0 Fix JEI error from a circular enum dependency 2019-04-10 21:26:18 -04:00
temp1011 379d4b5603 prevent z fighting when bio gen has low fuel levels 2019-04-11 07:19:24 +08:00
Richard Freimer 9d98ef575d Port config rewrite (#5378)
Port Config system, Remove some unused code, Refactored various Tier enums out into their own package
2019-04-11 07:18:59 +08:00
Richard Freimer a776879eed Readd voice server (#5374)
* Add back the voice server defaulted to disabled

* Port 098472a make voice output properly sleepy

* Cleanup some of the voice server code

* Keep track of UUID in VoiceConnection instead of username

* Collapse a few missed error logging into stack trace printing

* Add tooltip to walkie talkie when voice server is disabled

* Fix single player crash if voice server is enabled after launch before world start
2019-04-10 15:12:12 -04:00
Richard Freimer a1e0688af8 Make many more Mekanism fluid renderers Stack aware for NBT purposes (#5360)
* Port 72251446f make many more Mekanism fluid renderers Stack aware for NBT purposes

* Make it a bit easier to see osmium in the compressor

* fix a missed stack color get

* move osmium gas colour back to a more vibrant blue for contrast reasons
2019-04-10 10:12:45 -04:00
Richard Freimer 88eae4f314 Port a couple missed commits (#5376)
* Port d303295da Move all version number references to gradle based

* Port ebb0c467717 dont set main multiblock position to air if its not loaded or not the right tile. Log if its not null but not what we expect

* Fix compile error
2019-04-09 22:39:06 -04:00
pupnewfster 2074a6abea Port 6c6c21a96 fix once-off sound event playing using volume option for pitch 2019-04-10 10:09:16 +08:00
pupnewfster 5aabc45f83 Port ce18f1043 Use less world access in digital miner thread 2019-04-10 10:08:53 +08:00
pupnewfster 4285b4c08c Port 588fc13ce Add some null safety for EnergyWrapperAcceptor(s). 2019-04-10 10:04:37 +08:00
Xander 9788c26299 Merge pull request #5371 from mekanism-mod/port_world_fallback
Fall back to FMLCommonHandler if world is not WorldServer where we otherwise expected it to be
2019-04-10 10:01:02 +08:00
Xander 2909705785 Merge pull request #5370 from mekanism-mod/port_ic2_charging
Minor cleanup to Charge Utils
2019-04-10 09:59:56 +08:00
pupnewfster 5610520fbd Port 047c8303a Fall back to FMLCommonHandler if world is not WorldServer where we otherwise expected it to be 2019-04-09 12:35:24 -04:00
pupnewfster efc8498557 Make ChargeUtils easier to read
Change order of attempted energy types to:
Ours
Forge
RF
Tesla
IC2
2019-04-09 12:25:02 -04:00
pupnewfster 5a9423521a Port 2d9d5463a make BlockBounding a little more aware of mainPos triggering infinite recursion 2019-04-09 11:35:08 -04:00
Richard Freimer 1e5e853241 Disable some capabilities in missed spots (#5364)
* Don't expose item handler in spots there are never slots accessible.
Change Oredictionificator to be accessible on all sides except the front
2019-04-09 00:38:16 -04:00
Richard Freimer b82a74cb75 Port 8e7a313a2 fix missing texture warnings (#5365) 2019-04-09 00:10:15 -04:00
Richard Freimer 7e3cfb8d02 Port 5d205e725 put recipe values as an immutable list (#5366) 2019-04-09 00:10:08 -04:00
Richard Freimer ec7144b493 Port 8de559998 ensure some edge cases with GasTank stack having 0 amount can't happen (#5361) 2019-04-08 14:26:00 -06:00
Richard Freimer 29951ae7ca Ported metallurgy ore doubling and cyclic integration stuff (#5358) 2019-04-08 14:08:27 -06:00
Richard Freimer 4ea79c529c Port a7fbfff75 fix energy cubes missing the spinny cube on load/enter-area (#5359) 2019-04-08 13:19:13 -04:00
Richard Freimer a3ae18703b Port factory insertion (#5346)
* Port dfd5252cd and improve factory auto sort performance
* Fix comparing against wrong item causing being unable to insert into factory at all
* Only auto sort into a slot if the recipe output will stack with the current output
* Make factory slot insertion obey changes to checking output items as well
2019-04-08 10:59:29 -06:00
Thiakil 5c03e9c3d4 fix keybinding repeat flag, per https://github.com/mekanism-mod/Mekanism/commit/18784b9c91190e9b5d8594816ef15fd53d98f8ad#commitcomment-33070594 2019-04-08 18:46:43 +08:00
Thiakil 18784b9c91 Port of 41e1f52a7; remove assert closes #5208 2019-04-07 22:19:28 -06:00
Thiakil 6ae6495732 Port of fcbdb51c9; implement PlayerOrderedCallback so that player-specific tickets load properly 2019-04-07 22:11:31 -06:00
JonMaker050 9f61f76d80 Update es_es.lang
translation to spanish (Spain)

Changes: Release 1.0

Grant update!!
Traslated the 98%!!
2019-04-07 20:45:02 -06:00
Dave Smith 9456b68529 Introduce bounds to search for sparkles! (#5343)
* Address c368692a3; create upper bound on number of blocks scanned and reduce memory utilization

* Final cleanup on sparkle overhaul; all multiblock structures should now sparkle in < 1ms on average

* Remove timing info; either enable sparkles or the message (not both)
2019-04-07 22:43:17 -04:00
Thiakil 6e3b3fcf56 Change thermal evap controller check to not recurse. Fixes #5334 2019-04-08 10:03:03 +08:00
Richard Freimer df67af26ac When creating fluids from gases set their alpha value to no transparency (#5353)
* When creating fluids from gases set their alpha value to no transparency
 Fixes https://github.com/mekanica/mekanica/issues/157

* Remove unneeded bitshifting
2019-04-07 19:16:53 -04:00
Aidan 17708ce587 Fix TransporterStack home locations & DM inventory interaction (#5335)
* Fix DM charge slot inventory interaction, fixed TransporterStack home paths

* Added clarification comment to JavaDoc for canBeCharged/Discharged
2019-04-07 19:16:25 -04:00
pupnewfster 7704846128 Port 25ca41e5e allow custom item matching in recipe inputs. closes #5241 closes https://github.com/mekanica/mekanica/issues/109 2019-04-07 10:30:47 -06:00
Richard Freimer 5a2a902366 Port 32b040353 and keep track of active modes via uuid's instead of names (#5348) 2019-04-06 10:38:55 -04:00
JonMaker050 610d65f522 Translation to Spanish! (#5337) 2019-04-06 13:35:00 +11:00
pupnewfster 41d4db1b4c Port d8fa091c5 dont do distance calculation when teleporting between dimensions 2019-04-05 18:14:14 -07:00
pupnewfster 5b0814e16b Port 486e5d451 clamp int for forge energy wrapper 2019-04-05 18:11:25 -07:00
Richard Freimer 0b060ead4b Box blacklist (#5345)
* Ported a bunch of cardboard box blacklist commits

* Added a couple wrapper methods to make it a little easier to read
2019-04-05 19:24:42 -04:00
Dave Smith 890bc954d4 Fix #5156; if protection is disabled, always return true on access checks (#5342) 2019-04-05 10:53:35 -04:00
pupnewfster 6a1657eaa6 Fix some desync in data between server and client active states of blocks 2019-04-04 11:23:40 -04:00
Dave Smith 32eccdec9c Rename all Mekanica -> Mekanism 2019-04-03 10:50:13 -07:00
Aidan 584a51e779 Merge pull request #150 from SadChimera/master
Obsidian dust added as crushing recipe, Fixed other bugs related to obsidian dust
2019-04-03 10:54:15 -04:00
JonMaker050 883a73632c Create es_ES.lang
Inicio traducción a Español Castellano /  translation to spanish Build v0.1
2019-04-03 15:30:27 +02:00
aidancbrady 6a0f8e386d Fix #5329
Check against homeLocation when finding TransporterStack acceptors; also, don't allow inventory insertion/extraction of things in charge slot for Digital Miner
2019-04-02 20:16:11 -04:00