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

3845 commits

This branch
This branch
All branches
Author SHA1 Message Date
Magnar Polden b12301a984
Update gradle.yml 2021-07-08 17:54:58 +02:00
Magnar Polden d43f33ef8b
Create gradle.yml 2021-07-08 17:53:54 +02:00
Pokemonplatin 49ee3343df Teleporter and Quantum Entangloporter now have a trusted channel for smp 2021-07-03 00:12:08 +02:00
Pokemonplatin c7d448ecea Downgrade to gradle 2.0 2021-07-02 16:03:37 +02:00
Magnar 2f82db0429
fix bug report 2021-01-21 16:47:27 +01:00
Magnar 8b71e68616
Merge pull request #20 from Thorfusion/1.7.10-dev2 
pull cape fix and bump version
 2021-01-08 23:22:41 +01:00
maggi373 16ca996faf bump version 2021-01-08 23:17:14 +01:00
maggi373 bcad2d9274 fix cape module 
bad coding from my side
 2021-01-08 23:16:08 +01:00
Magnar 081ea21beb Update issue templates 2021-01-02 04:00:19 +01:00
Magnar 1f73c718b1
Merge pull request #15 from Thorfusion/1.7.10-dev2 
Update server change and added cape module from titanstorms
 2020-12-30 00:42:20 +01:00
maggi373 beae5c46a3 Update CommonProxy.java 2020-12-30 00:40:36 +01:00
maggi373 dcc53c46b9 fix for update 
update notification now working
cant have letters in version number
removed a line in mk command
also changed download address
https actually works so changed back for that
 2020-12-29 22:20:02 +01:00
maggi373 862dc47f81 whoops 
whoops
 2020-12-29 21:24:14 +01:00
maggi373 2531ff47aa fix for update download 
added the new link
added link for download
 2020-12-29 21:20:58 +01:00
maggi373 76eac49f92 Update ThreadGetData.java 
changed update server
 2020-12-29 20:54:05 +01:00
maggi373 69c27b557f update version number 2020-12-29 20:35:34 +01:00
maggi373 11cb0459f6 new version number 2020-12-29 19:56:50 +01:00
maggi373 04f689b41c test 2020-12-29 02:16:38 +01:00
maggi373 dc2ed4824b test 2020-12-28 18:53:55 +01:00
Magnar dc6220def7
cleanup of readme 
cleanup, removed old readme text that is not that much relevant for this custom version
 2020-12-28 18:43:23 +01:00
Magnar d27387b9e0
Update README.md 2020-11-30 20:56:06 +01:00
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