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 |
|
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 |
|