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

3380 commits

This branch
This branch
All branches
Author SHA1 Message Date
aidancbrady
a14b0d77ad Fixed Induction Matrix computer integration 2015-11-25 10:34:49 -07:00
aidancbrady
2640cbd50b Fixed injection rate integration 2015-11-25 10:26:50 -07:00
aidancbrady
0313e59b8f BuildCraft API cleanup and update 2015-11-25 10:24:45 -07:00
aidancbrady
79483d1fa7 Merge branch 'master' into development 2015-11-25 10:10:04 -07:00
aidancbrady
650224bdd8 Fixed Solar Evaporation Controller crash 2015-11-25 10:09:48 -07:00
Aidan
8e996b0770 Merge pull request #3014 from timstableford/master 
Fix for CC peripherals always throwing error.
 2015-11-25 10:03:41 -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
Aidan
8ecf0a74a8 Merge pull request #2950 from shadowfacts/sync-xp 
Force the player's experience to sync when changing dimensions
 2015-11-03 21:24:10 -05:00
Aidan
dd776969c6 Merge pull request #2942 from Vexatos/patch-11 
Update de_DE.lang
 2015-11-03 21:21:49 -05: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
Vexatos
d0046e97ab Update de_DE.lang 2015-08-31 16:45:14 +02: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
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