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

1307 commits

Author SHA1 Message Date
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
728e497dd1 Forgot about generators! 2015-07-20 11:58:03 -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
74939083c8 Fix frame mods moving Teleporters with fake worlds 
If there is no ChunkProvider, the block can't be unloaded.
 2015-07-19 13:40:03 +01:00
aidancbrady
2c88357477 Merge branches 'development' and 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-18 23:57:58 -07:00
aidancbrady
6ab72698dc Finally made my IDEA workspace happy, assets weren't being recognized for some reason 2015-07-18 23:57:50 -07: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
Ben Spiers
3d34b8c83f Make it actually possible to watch transmitter log 
Don't know how/when that broke.
 2015-07-18 21:50:42 +01:00
aidancbrady
a2fb334833 IMC-based recipe removal. Wiki is updated as well :) 2015-07-14 15:59:55 -07:00
aidancbrady
a1eb8306ee Defined redstone connections for Redstone Logic Adapters, closes #2808 2015-07-14 15:43:23 -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
e9fb7f164c Fix statistics render 2015-07-06 13:58:48 -07: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
1edec150c6 Reactor injection rate now rounds down to nearest even integer 2015-07-06 13:26:26 -07:00
aidancbrady
274b6d1477 Update copyright, minor cleanup 2015-07-06 11:26:48 -07:00
aidancbrady
cdd76c5edd Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-06 08:47:07 -07:00
aidancbrady
19ccc2c025 Added CC integration to Laser Amplifiers 2015-07-06 08:44:43 -07:00
Aidan
6b90802f8f Merge pull request #2789 from halvors/development 
Added the default transparent greyed out background to GuiScreen's.
 2015-07-02 08:15:38 -07:00
Aidan
2eeee08cf2 Merge pull request #2793 from tterrag1098/master 
Maintain java 6 source compatability in API classes
 2015-07-01 23:09:14 -07:00
Halvor Lyche Strandvoll
bb6273cf86 Replaced spaces with tabs in GuiPasswordEnter and GuiPasswordModify. 2015-07-02 07:21:58 +02:00
Halvor Lyche Strandvoll
37b011c327 Added the default transparent greyed out background to GuiScreen's. 
Added the default transparent greyed out background to the
GuiPasswordEnter and GuiPasswordModify GuiScreen's.
 2015-07-01 15:47:11 +02: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
tterrag1098
d85dfd4f31 Maintain java 6 source compatability in API classes 2015-06-30 00:48:05 -04: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
26409dd0b3 Fixed reactor blocks not dropping 2015-06-13 16:08:47 -04:00
aidancbrady
a382280be5 Don't spam console with transmitter logs unless debug is on 2015-06-13 14:55:36 -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
462c5a91b0 Fixed gauge render 2015-06-11 20:09:47 -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
03727deda8 Reactor Logic Adapter now is solid 2015-06-05 11:59:30 -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
374a7e95b5 Reactor Frames and Ports are now solid 2015-05-31 00:02:15 -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
0c2707cd05 Made sparkle animation less cpu intensive 2015-05-09 18:47:34 -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
09ba6fd8b4 Fixed block rotations 2015-05-05 10:57:34 -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
c61e4c116b Cleanup 2015-04-12 17:19:32 -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
c23aafee9f Should fix the NPE in updateTransmitterOnSide. 2015-04-12 00:19:49 +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
5b558065fc Might fix the NPE in FluidNetwork that @NitroxydeX was experiencing 2015-04-10 18:54:38 +01:00
Ben Spiers
468abefe17 Fix NPE on creating networks. 2015-04-10 18:39:27 +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
Aidan C. Brady
a61974a681 Cleanup 2015-04-06 10:12:59 -04:00
Ben Spiers
1997054bad Merge branch 'development' into networkRefactor 2015-04-06 04:36:11 +01:00
Ben Spiers
f4a6fb8274 Do some things I TODOed earlier 2015-04-06 04:32:47 +01:00