aidancbrady
06dc2227f2
A few ejector fixes
2016-01-28 23:45:22 -07:00
aidancbrady
a22b33a629
Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output
2016-01-29 00:34:50 -05:00
aidancbrady
0a135a6936
Loads of changes to Electric Pump, Fluidic Plenisher and Transmitters
...
- Electric Pumps are now more efficient, upgradable, and have new config options, one of which prevents sucking of water sources (true by default)
- Fluidic Plenishers are now upgradable
- Transmitters can be upgraded by being right-clicked by alloys normally involved in crafting-based upgrading
2016-01-28 20:38:32 -05:00
aidancbrady
b9d064dc06
Cleanup
2016-01-26 08:38:00 -05:00
aidancbrady
b450e7e408
Turbine fixes. They're just about polished
2016-01-26 08:10:36 -05:00
aidancbrady
47b06cd577
More fixes, added recipes for turbine components
2016-01-25 11:58:32 -05:00
aidancbrady
5f23709b0f
One last interface fix
2016-01-25 00:30:14 -05:00
aidancbrady
d210f6c47c
Interface fixes
2016-01-25 00:29:28 -05:00
aidancbrady
2984bf45a8
Loads of untested work on turbine interface
2016-01-25 00:13:42 -05:00
aidancbrady
afe8969c37
Added energy management to turbine and turbine valves
2016-01-23 00:40:30 -05:00
aidancbrady
769a8fd480
Multiblock protocol works, begin turbine tile code
2016-01-22 23:46:16 -05:00
aidancbrady
c341e6290b
Stuff now renders normally
2016-01-22 20:23:20 -05:00
aidancbrady
8e1adc97ea
Turbine assets completed, added blocks in-game. Still need to add special effect rendering, but that will come later
2016-01-22 20:08:37 -05:00
aidancbrady
9cbc96a88e
Textures for turbine components! Still need to texture turbine structure blocks.
2016-01-22 19:36:39 -05:00
aidancbrady
cfa2c1e4d9
Hopefully finalized multiblock form code, started on bringing the new blocks in-game
2016-01-22 17:46:04 -05:00
aidancbrady
8cab2ebe8c
Rename Turbine Rod to Turbine Rotor, work on multiblock form code
2016-01-22 17:22:20 -05:00
aidancbrady
0c025e1033
Structural Glass is now real, started on core turbine multiblock code
2016-01-22 15:41:34 -05:00
aidancbrady
bb9c203fae
After some very frustrating fixes, added Rotational Complex (with debug max rotation) and got turbines to properly rotate
2016-01-22 00:04:44 -05:00
aidancbrady
6e9ee32df1
Turbines now render and look fancy, fixed some multiblock code
2016-01-21 20:36:40 -05:00
aidancbrady
51c9ca061c
Merge branch 'development' into v9
...
* development:
Use apache library
2016-01-19 14:41:25 -05:00
aidancbrady
dc7f5cfc9b
Merge branch 'master' into development
...
* master:
Use apache library
2016-01-19 14:41:13 -05:00
aidancbrady
bfd32a1c3e
Use apache library
2016-01-19 14:41:05 -05:00
aidancbrady
bc57033fb9
Merge branch 'development' into v9
...
* development:
Fix a small transporter bug
2016-01-18 17:18:24 -05:00
aidancbrady
17425b998f
Merge branch 'master' into development
...
* master:
Fix a small transporter bug
2016-01-18 17:18:12 -05:00
aidancbrady
1540cd2230
Fix a small transporter bug
2016-01-18 17:18:05 -05:00
aidancbrady
609ed4e3a1
Turbine Rods and Turbine Blades added in-game, multiblock functionality and interaction complete- still need to finish model and rendering stuff
2016-01-17 17:21:06 -05:00
aidancbrady
4c2b470213
Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine
2016-01-17 15:59:02 -05:00
aidancbrady
66cc62a600
Merge branch 'development' into v9
...
* development:
Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods
2016-01-17 13:59:50 -05:00
aidancbrady
c1c15ae707
Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods
2016-01-16 11:29:37 -05:00
aidancbrady
e747937760
Fixed Solar Generator desert bonus
2016-01-13 23:40:48 -05:00
aidancbrady
7f21516841
Fixed factory tab lighting
2016-01-13 23:15:58 -05:00
aidancbrady
2a78265419
Changed name of boiler to fix conflicts
2016-01-13 18:02:47 -05:00
aidancbrady
3f158d26da
Fixed cable crash
2016-01-13 17:00:25 -05:00
aidancbrady
c03c7e0f7a
Fixed Reactor Port not accepting items
2016-01-13 16:21:08 -05:00
aidancbrady
0efbd28c8f
Updated Box Blacklist parser to be more intuitive
2016-01-13 16:08:14 -05:00
aidancbrady
e950c645e7
Fixed Solar Evaporation Plant memory leaks
2016-01-13 10:53:16 -05:00
aidancbrady
a8efb3b0de
Better Solar Evaporation Plant algorithm- much less CPU intensive and fixes all the weird building bugs
2016-01-13 00:10:13 -05:00
aidancbrady
0961b7e042
Reactors now scale steam and water tank capacity to injection rate
2016-01-12 19:07:29 -05:00
aidancbrady
0e1a08474c
Removed test recipe registration
2016-01-12 18:48:35 -05:00
aidancbrady
9b3969f1ff
Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes
2016-01-12 18:41:15 -05:00
aidancbrady
ab5fe0c819
Fixed IMC recipe deletion
2016-01-11 21:13:36 -05:00
aidancbrady
0b984148b4
Fixed blocks not being harvested by items with one damage level
2016-01-11 21:00:32 -05:00
aidancbrady
a72e043947
WAILA bounding block support
2016-01-11 20:55:16 -05:00
aidancbrady
72193075ab
More efficient transporter tree searching
2016-01-11 20:45:13 -05:00
aidancbrady
b6306d0779
More sound fixes
2016-01-09 13:37:37 -05:00
aidancbrady
4d65942f11
Server hotfix
2016-01-09 10:07:22 -05:00
aidancbrady
99fc98faf5
Fixed HolidayManager
2016-01-08 12:24:27 -05:00
aidancbrady
faf63dfebc
Updated readme, improved Electric Pump calculation
2016-01-08 00:40:37 -05:00
aidancbrady
7016268cbc
Better redstone support, fixed fuse sound
2016-01-05 20:35:42 -05:00
aidancbrady
8728531f77
Add short parsing to PacketHandler
2016-01-05 15:35:36 -05:00
aidancbrady
f9681a9942
Quick lib fix
2016-01-04 18:13:46 -05:00
aidancbrady
08eb8be841
A few necessary library additions
2016-01-04 00:33:00 -05:00
aidancbrady
11574e9454
Fixed Reactor Logic Adapter double parse, thanks @habnabit
2015-12-31 15:06:11 -05:00
aidancbrady
3ff2ede090
Updated Electrolytic Separator internals to support redstone control
2015-12-31 14:55:49 -05:00
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
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
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
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
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
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
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
173be49a4a
Merge branch 'master' into development
2015-05-22 23:07:51 -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
Lemmmy
273955a522
Fixed Pressurised Tubes being named incorrectly in en_GB
2015-05-12 18:37:36 +01: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
Anton
ec4691abf8
Update ru_RU.lang
2015-05-04 10:46:43 +03:00
TheVikingWarrior
314d3bd699
Update it_IT.lang
...
Finished it, but I'd like to remind you of issue https://github.com/aidancbrady/Mekanism/issues/2406 for the best translation
2015-05-02 00:36:20 +02: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
Aidan
f1b0410cad
Merge pull request #2551 from emperor06/CC_InductionMatrix
...
Added ComputerCraft support to Induction Matrix.
2015-04-16 17:55:20 -04:00
