maggi373
|
2b72a47ab7
|
Merge branch 'pr/9' into 1.7.10
|
2020-08-03 06:07:10 +02:00 |
|
maggi373
|
9317a4a329
|
Merge branch 'pr/8' into 1.7.10
|
2020-08-03 06:06:22 +02:00 |
|
Magnar
|
73f9c64256
|
Merge pull request #10 from awesomely2002/patch-1
Update InventoryFrequency.java by awesomely2002
|
2020-08-03 05:52:01 +02:00 |
|
Magnar
|
1d5d3d33db
|
Merge pull request #11 from Bogdan-G/master
Fixes by Bogdan-G
|
2020-08-03 05:21:22 +02:00 |
|
Magnar
|
c5423e9af5
|
Merge pull request #6 from clienthax/patch-1
InstanceOf check to avoid issues with railcraft. by clienthax
|
2020-08-03 05:04:05 +02:00 |
|
maggi373
|
e384b6e6b3
|
dev stuff
|
2020-08-03 04:30:27 +02:00 |
|
Magnar
|
9baf4682c5
|
Merge pull request #4 from q1051278389/1.7.10
Fixes by q1051278389
|
2020-08-03 03:46:41 +02:00 |
|
maggi373
|
946bf219e3
|
removed junk from merge
|
2020-08-03 03:43:46 +02:00 |
|
Magnar
|
498bc8b3b2
|
Merge pull request #3 from OneDayStudios/1.7.10
Fixes by draksterau
|
2020-08-03 03:37:41 +02:00 |
|
Magnar
|
f2ae8e089d
|
Merge pull request #2 from iKEVAREZ/1.7.10
Fixes by kmecpp and ikevarez
|
2020-08-03 03:22:33 +02:00 |
|
Magnar
|
33f2fd94ec
|
Merge pull request #1 from DEv0on/1.7.10
Fixes done by DEv0on and Ikevarez
|
2020-08-03 03:21:29 +02:00 |
|
Xmsoft
|
eda32700e3
|
init gradle
|
2020-07-30 23:44:13 +08:00 |
|
Xmsoft
|
438ceb7145
|
try to fix reactor unburned after chunkloading
|
2020-07-30 15:55:47 +08:00 |
|
Xmsoft
|
5781717e9e
|
update log
|
2020-07-29 20:45:07 +08:00 |
|
Xmsoft
|
2c4331c62f
|
fix Turbine and Matrix bug
|
2020-07-29 20:28:49 +08:00 |
|
Bogdan
|
7e2dd130da
|
Config option ReduceRenderMachines, gl d->f, replace Random in XSTR
|
2020-01-28 02:36:20 +03:00 |
|
Bogdan
|
84b342bd0b
|
fix for old java without or/and use ssl/tls
|
2020-01-05 12:57:14 +03:00 |
|
Bogdan
|
2ca34400cc
|
Merge pull request #1 from mekanism/1.7.10
1.7.10
|
2020-01-05 12:35:53 +03:00 |
|
Bysokar
|
7c90e8da68
|
Woops
|
2019-07-28 08:47:38 +10:00 |
|
Bysokar
|
d9a16a7342
|
Shuts down wind gens in space and HS
|
2019-07-28 08:07:47 +10:00 |
|
Bysokar
|
9e0f71dae4
|
wip
|
2019-07-28 07:57:26 +10:00 |
|
Bysokar
|
25115a4709
|
WIP
|
2019-07-28 07:54:30 +10:00 |
|
Bysokar
|
eabbd7ba33
|
Should fix the server crash
|
2019-07-28 07:27:54 +10:00 |
|
Bysokar
|
1a4e88b9b0
|
Should fix the bug
|
2019-07-28 07:24:11 +10:00 |
|
iKEVAREZ
|
c3334c21d4
|
Merge pull request #6 from kmecpp/patch-1
Fix dupe bug with factorioes
|
2018-12-27 18:31:09 +01:00 |
|
kmecpp
|
faad2dca4c
|
Fix dupe bug with factorioes
|
2018-12-25 12:19:10 -05:00 |
|
clienthax
|
a4cdbb544d
|
[1.7.10] Fix dupe bug with chemical washer
https://www.youtube.com/watch?v=i86989eh4Kc&feature=youtu.be
|
2018-12-06 14:29:15 +00:00 |
|
clienthax
|
adb09e43ea
|
Fix dupe bug with fluid tank
https://github.com/aidancbrady/Mekanism/issues/3609
|
2018-12-02 19:18:57 +00:00 |
|
awesomely2002
|
aad8be1a0d
|
Update InventoryFrequency.java
Entangloporters need to transport more
|
2018-07-04 20:24:22 -04:00 |
|
DEv0on
|
c592ffe520
|
Merge branch '1.7.10' of https://github.com/DEv0on/Mekanism into 1.7.10
|
2018-05-27 15:21:27 +02:00 |
|
DEv0on
|
862d889015
|
Dupe + bug fixes
Naprawiono kopiowanie z Chemical Washerem i Fluid Tankami, a także bug turbiny polegający na wciąganiu każdego fluidu.
|
2018-05-27 15:21:24 +02:00 |
|
iKEVAREZ
|
143dc5699f
|
fixes
Fixed Chemical Washer, Fluid Tank and Turbine bug.
Co-Authored-By: dev0on <dev0on@users.noreply.github.com>
|
2018-05-27 15:18:18 +02:00 |
|
clienthax
|
44683793f6
|
InstanceOf check to avoid issues with railcraft.
|
2018-05-06 08:42:51 +01:00 |
|
aidancbrady
|
611627519d
|
Update version stuff
|
2017-08-31 16:46:06 -04:00 |
|
aidancbrady
|
1edf2ee5cc
|
Revert "Temporary fix"
This reverts commit 24319034fa.
|
2017-05-16 11:17:38 -04:00 |
|
aidancbrady
|
24319034fa
|
Temporary fix
|
2017-05-16 11:09:45 -04:00 |
|
aidancbrady
|
9a0c0b0a00
|
Fix a quick miner issue
|
2017-04-26 18:10:30 -04:00 |
|
Aidan
|
fadbb16a86
|
Merge pull request #3652 from clienthax/1.7.10
Add config option to disable block protections
|
2016-11-27 13:28:18 -05:00 |
|
clienthax
|
c149941034
|
Merge branch '1.7.10' of https://github.com/aidancbrady/Mekanism into 1.7.10
|
2016-10-10 12:30:13 +01:00 |
|
aidancbrady
|
ddc9e68f8e
|
Added version-based handling, bump version to 9.1.1
|
2016-09-06 21:49:47 -04:00 |
|
aidancbrady
|
245465dc8c
|
Bump up Dynamic Tank max storage, fixed Factory container issue
|
2016-09-05 15:29:43 -04:00 |
|
Clienthax
|
03191f198b
|
Add config option to disable block protections
|
2016-08-15 02:58:15 +01:00 |
|
aidancbrady
|
833d7372fb
|
Fixed chunk churning issue with frames
|
2016-08-09 01:34:47 -04:00 |
|
aidancbrady
|
3462baf761
|
Restrict Thermal Evaporation Plant output to needed
|
2016-07-25 18:56:40 -04:00 |
|
Aidan
|
50693e27d2
|
Going back to MIT, thanks to the concerns of @bshelden and @asiekierka
|
2016-07-20 02:43:41 -04:00 |
|
Aidan
|
d1eff9c378
|
Updated license to prevent future misuse of Mekanism
|
2016-07-19 16:46:03 -04:00 |
|
aidancbrady
|
bc0bd80302
|
Removed println
|
2016-07-19 15:46:51 -04:00 |
|
aidancbrady
|
a59ba334ba
|
Wind Generators are now much more efficient
|
2016-07-19 15:43:09 -04:00 |
|
aidancbrady
|
0ae477fd01
|
Completed Opaque Transmitter implementation. Yay!
|
2016-07-19 14:03:11 -04:00 |
|
Aidan
|
640de3ef4c
|
Merge pull request #3493 from chaos234/opaque
Opaque
|
2016-07-19 13:41:53 -04:00 |
|