Commit graph

1000 commits

Author SHA1 Message Date
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