Commit graph

3243 commits

Author SHA1 Message Date
aidancbrady bd3bc4402f Fix Metallurgic Infuser upgrade slot conflict 2015-12-31 14:25:26 -05:00
aidancbrady a71b6bda01 Adjustable Flamethrower modes - combat, heat, and inferno 2015-11-28 08:58:26 -07:00
aidancbrady f88a97697f Fixed Gas Tank comparator support 2015-11-27 23:29:55 -07:00
aidancbrady 21fa9fdb26 Cleaned up computer integration 2015-11-27 23:19:29 -07:00
aidancbrady c2006d5e70 Computer integration fixes 2015-11-27 23:04:43 -07:00
aidancbrady a4ab830e79 Cleanup, added Redstone Logic Adapter OC support 2015-11-27 22:04:39 -07:00
aidancbrady fbd692b4e0 Fixed transporter tier calculations 2015-11-27 12:30:49 -07:00
aidancbrady f5c48f60e6 Teleport now specifies orientation, closes #2977 2015-11-27 10:41:45 -07:00
aidancbrady 6466463a63 Bumped version 2015-11-26 15:44:42 -07:00
aidancbrady 2b785c95f3 Transmitters now intelligently maintain buffers when transmitter nodes are destroyed 2015-11-26 15:41:22 -07:00
aidancbrady b248cf4b07 Fixed fluid/gas duplication 2015-11-26 14:40:46 -07:00
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 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