Commit graph

  • 1d27a8d4db version bump forgot those maggi373 2020-08-05 02:10:46 +0200
  • f9076e0c70
    Create LICENSE.md Magnar 2020-08-04 18:58:53 +0200
  • d157eccda2 bump version maggi373 2020-08-04 18:51:30 +0200
  • 2b015b3395
    Update README.md Magnar 2020-08-04 18:42:25 +0200
  • 062224011f
    Update README.md Magnar 2020-08-04 07:46:36 +0200
  • c3b9f97917 whoops maggi373 2020-08-04 06:56:17 +0200
  • a095a3c17a Fix bin duping maggi373 2020-08-04 06:10:35 +0200
  • 745828670f Update version number n stuff maggi373 2020-08-03 20:46:53 +0200
  • 5e368f4284
    Update README.md Magnar 2020-08-03 20:32:59 +0200
  • 7b681f9612
    Update README.md Magnar 2020-08-03 20:32:17 +0200
  • d49101ba7a
    Update README.md Magnar 2020-08-03 20:31:32 +0200
  • f783b947dd
    Merge pull request #13 from Thorfusion/maggi373-patch-1 Magnar 2020-08-03 20:14:27 +0200
  • f8729ef2c6
    reverted changes Magnar 2020-08-03 19:59:27 +0200
  • d332a54a28 Revert "Config option ReduceRenderMachines, gl d->f, replace Random in XSTR" maggi373 2020-08-03 06:32:07 +0200
  • c190598504 Merge branch '1.7.10' of https://github.com/Thorfusion/Mekanism into 1.7.10 maggi373 2020-08-03 06:15:41 +0200
  • 23b23773b7 [1.7.10] Fix dupe bug with chemical washer clienthax 2018-12-06 14:29:15 +0000
  • 7a06133f66 Fix dupe bug with fluid tank clienthax 2018-12-02 19:18:57 +0000
  • 62e48003e1 Config option ReduceRenderMachines, gl d->f, replace Random in XSTR Bogdan 2020-01-28 02:36:20 +0300
  • 33537a1772 fix type for FFoKC Bogdan 2016-06-04 17:10:31 +0300
  • 2b72a47ab7 Merge branch 'pr/9' into 1.7.10 maggi373 2020-08-03 06:07:10 +0200
  • 9317a4a329 Merge branch 'pr/8' into 1.7.10 maggi373 2020-08-03 06:06:22 +0200
  • 73f9c64256
    Merge pull request #10 from awesomely2002/patch-1 Magnar 2020-08-03 05:52:01 +0200
  • 1d5d3d33db
    Merge pull request #11 from Bogdan-G/master Magnar 2020-08-03 05:21:22 +0200
  • c5423e9af5
    Merge pull request #6 from clienthax/patch-1 Magnar 2020-08-03 05:04:05 +0200
  • e384b6e6b3 dev stuff maggi373 2020-08-03 04:30:27 +0200
  • 9baf4682c5
    Merge pull request #4 from q1051278389/1.7.10 Magnar 2020-08-03 03:46:41 +0200
  • 946bf219e3 removed junk from merge maggi373 2020-08-03 03:43:46 +0200
  • 498bc8b3b2
    Merge pull request #3 from OneDayStudios/1.7.10 Magnar 2020-08-03 03:37:41 +0200
  • f2ae8e089d
    Merge pull request #2 from iKEVAREZ/1.7.10 Magnar 2020-08-03 03:22:33 +0200
  • 33f2fd94ec
    Merge pull request #1 from DEv0on/1.7.10 Magnar 2020-08-03 03:21:29 +0200
  • eda32700e3 init gradle Xmsoft 2020-07-30 23:44:13 +0800
  • 438ceb7145 try to fix reactor unburned after chunkloading Xmsoft 2020-07-30 15:55:47 +0800
  • 5781717e9e update log Xmsoft 2020-07-29 20:45:07 +0800
  • 2c4331c62f fix Turbine and Matrix bug Xmsoft 2020-07-29 20:28:49 +0800
  • 7e2dd130da Config option ReduceRenderMachines, gl d->f, replace Random in XSTR Bogdan 2020-01-28 02:36:20 +0300
  • 84b342bd0b fix for old java without or/and use ssl/tls Bogdan 2020-01-05 12:57:14 +0300
  • 2ca34400cc
    Merge pull request #1 from mekanism/1.7.10 Bogdan 2020-01-05 12:35:53 +0300
  • 7c90e8da68 Woops Bysokar 2019-07-28 08:47:38 +1000
  • d9a16a7342 Shuts down wind gens in space and HS Bysokar 2019-07-28 08:07:47 +1000
  • 9e0f71dae4 wip Bysokar 2019-07-28 07:57:26 +1000
  • 25115a4709 WIP Bysokar 2019-07-28 07:54:30 +1000
  • eabbd7ba33 Should fix the server crash Bysokar 2019-07-28 07:27:54 +1000
  • 1a4e88b9b0 Should fix the bug Bysokar 2019-07-28 07:24:11 +1000
  • c3334c21d4
    Merge pull request #6 from kmecpp/patch-1 iKEVAREZ 2018-12-27 18:31:09 +0100
  • faad2dca4c
    Fix dupe bug with factorioes kmecpp 2018-12-25 12:19:10 -0500
  • a4cdbb544d
    [1.7.10] Fix dupe bug with chemical washer clienthax 2018-12-06 14:29:15 +0000
  • adb09e43ea
    Fix dupe bug with fluid tank clienthax 2018-12-02 19:18:57 +0000
  • aad8be1a0d
    Update InventoryFrequency.java awesomely2002 2018-07-04 20:24:22 -0400
  • c592ffe520 Merge branch '1.7.10' of https://github.com/DEv0on/Mekanism into 1.7.10 DEv0on 2018-05-27 15:21:27 +0200
  • 862d889015 Dupe + bug fixes DEv0on 2018-05-27 15:21:24 +0200
  • 143dc5699f fixes iKEVAREZ 2018-05-27 15:18:18 +0200
  • 44683793f6
    InstanceOf check to avoid issues with railcraft. clienthax 2018-05-06 08:42:51 +0100
  • 611627519d Update version stuff aidancbrady 2017-08-31 16:46:06 -0400
  • 1edf2ee5cc Revert "Temporary fix" aidancbrady 2017-05-16 11:17:38 -0400
  • 24319034fa Temporary fix aidancbrady 2017-05-16 11:09:45 -0400
  • 9a0c0b0a00 Fix a quick miner issue aidancbrady 2017-04-13 17:11:07 -0400
  • fadbb16a86 Merge pull request #3652 from clienthax/1.7.10 Aidan 2016-11-27 13:28:18 -0500
  • c149941034 Merge branch '1.7.10' of https://github.com/aidancbrady/Mekanism into 1.7.10 clienthax 2016-10-10 12:30:13 +0100
  • ddc9e68f8e Added version-based handling, bump version to 9.1.1 aidancbrady 2016-08-11 12:15:16 -0400
  • 245465dc8c Bump up Dynamic Tank max storage, fixed Factory container issue aidancbrady 2016-09-05 15:28:55 -0400
  • 03191f198b Add config option to disable block protections Clienthax 2016-08-15 02:58:15 +0100
  • 833d7372fb Fixed chunk churning issue with frames aidancbrady 2016-08-09 01:34:47 -0400
  • 3462baf761 Restrict Thermal Evaporation Plant output to needed aidancbrady 2016-07-23 23:11:32 -0400
  • 50693e27d2 Going back to MIT, thanks to the concerns of @bshelden and @asiekierka Aidan 2016-07-20 02:22:04 -0400
  • d1eff9c378 Updated license to prevent future misuse of Mekanism Aidan 2016-07-19 16:46:03 -0400
  • bc0bd80302 Removed println aidancbrady 2016-07-19 15:46:51 -0400
  • a59ba334ba Wind Generators are now much more efficient aidancbrady 2016-07-19 15:43:09 -0400
  • 0ae477fd01 Completed Opaque Transmitter implementation. Yay! aidancbrady 2016-07-19 14:03:11 -0400
  • 640de3ef4c Merge pull request #3493 from chaos234/opaque Aidan 2016-07-19 13:41:53 -0400
  • ceb1c37b00 Fix Reactor Ports, again aidancbrady 2016-07-19 13:35:48 -0400
  • 6aa6591628 Bump up Electrolytic Separator gas output aidancbrady 2016-07-19 13:31:52 -0400
  • c4ee63081f Fixed Reactor Port crash aidancbrady 2016-07-19 13:16:37 -0400
  • 903d1c95a4 Updated Digital Miner textures aidancbrady 2016-07-18 16:07:53 -0400
  • 38024f98ad A few minor fixes, added Ultimate Tier Installer texture aidancbrady 2016-07-18 15:17:47 -0400
  • 71fbf0a2bd New textures, round 1. aidancbrady 2016-07-17 21:14:47 -0400
  • 401a4b5787 compleatly replaced files Marcel Petzold 2016-07-16 21:00:49 +0200
  • 438664e269 removed the word "opaque" in all image names Marcel Petzold 2016-07-16 20:30:29 +0200
  • e1a0965f66 added boolean opaque Marcel Petzold 2016-07-16 20:03:31 +0200
  • 955ed3e125 added boolean opaque Marcel Petzold 2016-07-16 20:03:12 +0200
  • a25217aab1 loaded config before Tier.init() Marcel Petzold 2016-07-16 20:02:41 +0200
  • cfcb2b33cf added new opaque images Marcel Petzold 2016-07-16 20:01:54 +0200
  • 1d51dd34dc Better Structural Glass recipe aidancbrady 2016-07-16 12:20:56 -0400
  • 88ead85f0e Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator aidancbrady 2016-07-16 12:16:55 -0400
  • ca52ba521b Fixed side output issue aidancbrady 2016-07-15 00:06:15 -0400
  • e4eb04ea13 Fixed texture registration issue aidancbrady 2016-07-13 17:19:23 -0400
  • 773d53e93a Fixed Logistical Transporter network pathfinding aidancbrady 2016-07-13 17:07:02 -0400
  • 61906fc309 Fixed Digital Miner and Logistical Sorter interfaces aidancbrady 2016-07-13 00:24:45 -0400
  • 6897b9a3ba Allow wildcards in transporter oredict filters again aidancbrady 2016-07-12 23:05:36 -0400
  • ae77ce0e19 Better text field management aidancbrady 2016-07-10 13:53:13 -0400
  • 9005e589e0 Fixed turbine crash aidancbrady 2016-07-07 00:32:47 -0400
  • 5fa3308565 Add necessary networking to Reactor Port aidancbrady 2016-07-06 17:56:40 -0400
  • 52daff9f67 Better tooltips aidancbrady 2016-07-06 17:53:14 -0400
  • 42f27058c2 Actually fix tier installers aidancbrady 2016-07-06 17:36:29 -0400
  • 7a117e20dc Add Silicon crusher recipe, fixed Tier Installers aidancbrady 2016-07-06 17:34:29 -0400
  • 28846dcb73 Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin aidancbrady 2016-07-06 17:21:24 -0400
  • 95c0ad4a73 Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines aidancbrady 2016-07-06 16:56:24 -0400
  • 53a9204974 Fixed Robit AI aidancbrady 2016-07-05 18:23:22 -0400
  • cdf4b16ec1 Fixed Robit dupe glitch aidancbrady 2016-07-05 17:30:34 -0400
  • f4582dbccf Fixed the stupid invalid frequency issue aidancbrady 2016-07-05 17:01:58 -0400
  • 9c7f1c059b Merge pull request #3438 from EzerArch/patch-1 Aidan 2016-07-04 11:03:33 -0400