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

3362 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan
de0cdd5334 Merge pull request #2856 from ruifung/mekFixes 
Another bugfix.
 2015-07-26 11:23:23 -07:00
Yip Rui Fung
9cb67fa054 Fix StackSearcher using variable side before initializing it. Fixes #2844 2015-07-26 15:24:59 +08:00
Aidan
94be300959 Merge pull request #2848 from ruifung/binCrashFix 
Some minor fixes.
 2015-07-25 13:08:10 -07: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
Aidan
28165fecdf Merge pull request #2838 from ruifung/patch-1 
Register transmitter items with AE2 P2P
 2015-07-23 12:04:28 -07: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
aidancbrady
4001b06b49 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-07-22 15:43:53 -07:00
aidancbrady
4e46fa4c5f no message 2015-07-22 15:43:47 -07: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
Ben Spiers
22282fc838 Update BC API 2015-07-21 20:45:05 +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
aidancbrady
2021ff0f7a Merge branch 'master' into development 2015-07-08 09:27:50 -07:00
Aidan
77a4ef3515 Merge pull request #2804 from Mazdallier/patch-3 
Update fr_FR.lang
 2015-07-08 09:27:12 -07:00
Halvor Lyche Strandvoll
037e1e553f Update getPickBlock() to use the new non-deprecated version. 2015-07-08 12:34:02 +02:00
Mazdallier
ea3bc94c29 Update fr_FR.lang 
heavy water bucket and reactor logic modes
 2015-07-08 12:02: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