tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
3808 commits 2 branches 0 tags 102 MiB
Commit graph

2015 commits

Author SHA1 Message Date
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
maggi373
d157eccda2 bump version 
im not using eclipse so i do it manually
 2020-08-04 18:51:30 +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
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
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
Magnar
73f9c64256
Merge pull request #10 from awesomely2002/patch-1 
Update InventoryFrequency.java by awesomely2002
 2020-08-03 05:52:01 +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
Magnar
9baf4682c5
Merge pull request #4 from q1051278389/1.7.10 
Fixes by q1051278389
 2020-08-03 03:46:41 +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
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
2c4331c62f fix Turbine and Matrix bug 2020-07-29 20:28:49 +08: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
kmecpp
faad2dca4c
Fix dupe bug with factorioes 2018-12-25 12:19:10 -05:00
awesomely2002
aad8be1a0d
Update InventoryFrequency.java 
Entangloporters need to transport more
 2018-07-04 20:24:22 -04: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
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
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
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
aidancbrady
ceb1c37b00 Fix Reactor Ports, again 2016-07-19 13:35:48 -04:00
aidancbrady
6aa6591628 Bump up Electrolytic Separator gas output 2016-07-19 13:31:52 -04:00
aidancbrady
c4ee63081f Fixed Reactor Port crash 2016-07-19 13:16:37 -04:00
aidancbrady
903d1c95a4 Updated Digital Miner textures 2016-07-18 16:07:53 -04:00
aidancbrady
38024f98ad A few minor fixes, added Ultimate Tier Installer texture 2016-07-18 15:17:47 -04:00
aidancbrady
71fbf0a2bd New textures, round 1. 2016-07-17 21:14:47 -04:00
Marcel Petzold
401a4b5787 compleatly replaced files 2016-07-16 21:00:49 +02:00
Marcel Petzold
438664e269 removed the word "opaque" in all image names 2016-07-16 20:30:29 +02:00
Marcel Petzold
e1a0965f66 added boolean opaque 2016-07-16 20:03:31 +02:00
Marcel Petzold
955ed3e125 added boolean opaque 2016-07-16 20:03:12 +02:00
Marcel Petzold
a25217aab1 loaded config before Tier.init() 2016-07-16 20:02:41 +02:00
Marcel Petzold
cfcb2b33cf added new opaque images 2016-07-16 20:01:54 +02:00
aidancbrady
1d51dd34dc Better Structural Glass recipe 2016-07-16 12:20:56 -04:00
aidancbrady
88ead85f0e Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator 2016-07-16 12:16:55 -04:00
aidancbrady
ca52ba521b Fixed side output issue 2016-07-15 00:06:15 -04:00
aidancbrady
e4eb04ea13 Fixed texture registration issue 2016-07-13 17:19:23 -04:00
aidancbrady
773d53e93a Fixed Logistical Transporter network pathfinding 2016-07-13 17:07:02 -04:00
aidancbrady
61906fc309 Fixed Digital Miner and Logistical Sorter interfaces 2016-07-13 00:24:45 -04:00
aidancbrady
6897b9a3ba Allow wildcards in transporter oredict filters again 2016-07-12 23:05:36 -04:00
aidancbrady
ae77ce0e19 Better text field management 2016-07-10 13:53:13 -04:00
aidancbrady
9005e589e0 Fixed turbine crash 2016-07-07 00:32:47 -04:00
aidancbrady
5fa3308565 Add necessary networking to Reactor Port 2016-07-06 17:56:40 -04:00
aidancbrady
52daff9f67 Better tooltips 2016-07-06 17:53:14 -04:00
aidancbrady
42f27058c2 Actually fix tier installers 2016-07-06 17:36:29 -04:00
aidancbrady
7a117e20dc Add Silicon crusher recipe, fixed Tier Installers 2016-07-06 17:34:29 -04:00
aidancbrady
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 2016-07-06 17:21:24 -04:00
aidancbrady
95c0ad4a73 Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines 2016-07-06 16:56:24 -04:00
aidancbrady
53a9204974 Fixed Robit AI 2016-07-05 18:23:22 -04:00
aidancbrady
cdf4b16ec1 Fixed Robit dupe glitch 2016-07-05 17:30:34 -04:00
aidancbrady
f4582dbccf Fixed the stupid invalid frequency issue 2016-07-05 17:01:58 -04:00
Ezer'Arch
a6b3ca7e9e Update pt_PT and pt_BR 
Minor change.
 2016-07-03 23:00:31 -03:00
Ezer'Arch
108cc0f3ee Creates pt_PT and updates pt_BR 
Creates the European Portuguese translation and updates Brazilian
Portuguese translation.
 2016-07-03 20:59:59 -03:00
aidancbrady
fdc21d8de5 Fixed break crash 2016-07-03 02:07:14 -04:00
aidancbrady
330756e5a7 Added configurable steam auto-output to Reactor Port 2016-07-02 20:33:27 -04:00
aidancbrady
41ea222aab Added Fluid Tank comparator support, fixed Gas Tank comparator support 2016-06-30 12:45:15 -04:00
aidancbrady
3b214376ba Implement config option for operators to bypass security, added turbine dump/dump excess functionality 2016-06-30 12:25:20 -04:00
aidancbrady
8f8f1751ec Fixed Tesseract and Flux Duct support 2016-06-30 11:14:21 -04:00
aidancbrady
0b9a71162a Updated IC2 API, fixed integration 2016-06-30 11:07:52 -04:00
aidancbrady
b77ca6ff0c Revert "Remove deprecated gas API methods" 
This reverts commit c5a414df37.
 2016-06-30 01:03:13 -04:00
aidancbrady
425b43a4c4 Reactor Ports now auto-eject steam 2016-06-30 00:46:02 -04:00
aidancbrady
c5a414df37 Remove deprecated gas API methods 2016-06-29 19:58:13 -04:00
aidancbrady
163e37de86 Merge branch 'master' into development 
* master:
  Finished czech localization
  847/1085
  797/1085
  636/1085
  602/1085
  508/1085
  Revert "Revert "114/1085 translations completed""
  Revert "114/1085 translations completed"
  114/1085 translations completed
  Added czech localization file
 2016-06-27 19:57:27 -04:00
Aidan
02af729175 Merge pull request #3409 from karakufire/development 
Update ja-JP.lang
 2016-06-27 19:56:19 -04:00
Jakub Rohla
09fa8f9f5a Finished czech localization 2016-06-27 20:32:20 +02:00
Jakub Rohla
961c84304e 847/1085 2016-06-27 20:04:06 +02:00
Jakub Rohla
e320616c37 797/1085 2016-06-27 17:42:02 +02:00
Jakub Rohla
15804b0b96 636/1085 2016-06-27 14:29:44 +02:00
Jakub Rohla
04e3fa195c 602/1085 2016-06-27 14:20:57 +02:00
Jakub Rohla
546dd1e9d5 508/1085 2016-06-27 13:54:28 +02:00
Jakub Rohla
8b335bdc04 Revert "Revert "114/1085 translations completed"" 
This reverts commit 1c6b74d854.
 2016-06-27 07:08:16 +02:00
Jakub Rohla
1c6b74d854 Revert "114/1085 translations completed" 
This reverts commit 9bc65d4593.
 2016-06-27 07:07:53 +02:00
Jakub Rohla
9bc65d4593 114/1085 translations completed 2016-06-27 07:07:02 +02:00
karakufire
2358c22fa8 Update ja-JP.lang 2016-06-27 11:45:45 +09:00
aidancbrady
8a166e108a Fixed heat displays 2016-06-26 15:48:47 -04:00
freemanovec
f450f6ddfe Added czech localization file 2016-06-24 09:29:03 +02:00
aidancbrady
b644fbc83f Fixed Bin amount render position 2016-06-22 14:25:20 -04:00