Commit graph

3674 commits

Author SHA1 Message Date
maggi373
cbd3558d35 Fix gradle
Fixed gradle so it has an output of all included but its what i want, also fixed version numbers
2020-10-04 00:50:11 +02:00
maggi373
1eabdaf35b fix gradlew
reverted changes for versioning system
2020-10-03 23:28:53 +02:00
maggi373
c7aa8dd201 Update build.properties
updated multipart
2020-10-03 15:06:46 +02:00
maggi373
38d6244ee5 it did not get fixed
test version still had multipart installed
2020-08-05 04:47:31 +02:00
maggi373
b4ace619b4 bump version 2020-08-05 04:36:51 +02:00
maggi373
008c55b2a8 fixes crash
fixes crash when forge multipart is not installed
2020-08-05 03:42:15 +02:00
maggi373
1d27a8d4db version bump forgot those 2020-08-05 02:10:46 +02:00
Magnar
f9076e0c70
Create LICENSE.md 2020-08-04 18:58:53 +02:00
maggi373
d157eccda2 bump version
im not using eclipse so i do it manually
2020-08-04 18:51:30 +02:00
Magnar
2b015b3395
Update README.md 2020-08-04 18:42:25 +02:00
Magnar
062224011f
Update README.md 2020-08-04 07:46:36 +02:00
maggi373
c3b9f97917 whoops 2020-08-04 06:56:17 +02:00
maggi373
a095a3c17a Fix bin duping
This is an not good job fixing the dupe but it works, i dont think many people carry many emtpy bins on them lel
2020-08-04 06:10:35 +02:00
maggi373
745828670f Update version number n stuff 2020-08-03 20:46:53 +02:00
Magnar
5e368f4284
Update README.md 2020-08-03 20:32:59 +02:00
Magnar
7b681f9612
Update README.md 2020-08-03 20:32:17 +02:00
Magnar
d49101ba7a
Update README.md 2020-08-03 20:31:32 +02:00
Magnar
f783b947dd
Merge pull request #13 from Thorfusion/maggi373-patch-1
reverted changes
2020-08-03 20:14:27 +02:00
Magnar
f8729ef2c6
reverted changes 2020-08-03 19:59:27 +02:00
maggi373
d332a54a28 Revert "Config option ReduceRenderMachines, gl d->f, replace Random in XSTR"
This reverts commit 62e48003e1.
2020-08-03 06:32:07 +02:00
maggi373
c190598504 Merge branch '1.7.10' of https://github.com/Thorfusion/Mekanism into 1.7.10 2020-08-03 06:15:41 +02:00
clienthax
23b23773b7 [1.7.10] Fix dupe bug with chemical washer
https://www.youtube.com/watch?v=i86989eh4Kc&feature=youtu.be
2020-08-03 06:11:58 +02:00
clienthax
7a06133f66 Fix dupe bug with fluid tank
https://github.com/aidancbrady/Mekanism/issues/3609
2020-08-03 06:11:40 +02:00
Bogdan
62e48003e1 Config option ReduceRenderMachines, gl d->f, replace Random in XSTR 2020-08-03 06:11:15 +02:00
Bogdan
33537a1772 fix type for FFoKC 2020-08-03 06:10:30 +02:00
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