Commit graph

3814 commits

Author SHA1 Message Date
DrParadox7
d37d04435c
Merge pull request #2 from Thorfusion/1.7.10
Merge Upstream
2022-09-11 18:41:30 +02:00
maggi373
9d84815c06
smarter recipe manager 2022-09-08 17:36:04 +02:00
maggi373
5733a8e1c5
remove unused import 2022-09-08 15:52:55 +02:00
maggi373
04ce9c8e49
move recipe to correct place 2022-09-08 15:52:18 +02:00
maggi373
7f416d7a0b
more oredict stuff 2022-09-08 15:48:38 +02:00
maggi373
3ae138881f
add more oredict osmium under config control 2022-09-08 15:38:37 +02:00
maggi373
9ee61943a9
set ordedict for platinum false by default 2022-09-08 15:25:52 +02:00
maggi373
85b12aa21d
config for ordict for osmium 2022-09-07 22:38:46 +02:00
maggi373
6dd5202004
bump version 2022-09-07 19:25:23 +02:00
maggi373
266b312ded
forgot some code to merge from terralizationcompat 2022-09-07 19:14:35 +02:00
maggi373
6c1cfdc2ce
bump version 2022-09-07 00:16:25 +02:00
maggi373
c77028ae7f
fix #34 2022-09-07 00:16:06 +02:00
maggi373
3801fa24fc
add latest cofh energy api 2022-09-06 22:11:19 +02:00
maggi373
fe3e39c155
add notice about dependencies 2022-09-04 15:02:19 +02:00
maggi373
e1df41aa40
update opencomputers api 2022-09-04 14:40:26 +02:00
maggi373
2fa5ead506
add back deploader 2022-09-04 14:36:09 +02:00
maggi373
c2e173a003
change to cofhlib 2022-09-04 14:35:26 +02:00
maggi373
b960eda9c2
use native itemstack for compressediamond 2022-09-04 14:10:52 +02:00
maggi373
fb92953775
port terralizationcompat stuff to mekanism ce
fixes #30
also voiceserver is now disabled by default
2022-09-04 14:06:37 +02:00
maggi373
293f109198
bump version 2022-09-04 12:41:39 +02:00
maggi373
8401bf5da7
add api.jar output 2022-09-04 12:40:19 +02:00
maggi373
bccd15d560
fixes #32
not the best fix but it works for now.
2022-09-04 12:32:02 +02:00
maggi373
c2b5a58539
remove unused metallurgy stuff 2022-09-03 20:13:01 +02:00
maggi373
f148a85ab3
update almost all dependencies
also using jars now
2022-09-03 19:46:40 +02:00
maggi373
d6ed645894
Update README.md 2022-09-03 18:30:14 +02:00
maggi373
3042a72380
Update README.md 2022-08-24 19:49:32 +02:00
maggi373
fdef261877
bump version 2022-08-24 18:53:50 +02:00
maggi373
4b27bad804
Merge pull request #29 from Scipio9001/1.7.10
Fix for the Enriched Alloy problem in issue #28
2022-08-24 18:51:51 +02:00
maggi373
5e6b618747
proper working fix for ingotsteel #29 #28 2022-08-24 18:50:47 +02:00
Scipio9001
59a94f277c Update Mekanism.java 2022-08-23 12:49:01 -05:00
maggi373
432523c4f8
Update LICENSE.md 2022-05-20 17:24:39 +02:00
maggi373
5f1c7bc873 Update README.md 2022-05-20 02:34:51 +02:00
maggi373
5ddc3038fd
Update LICENSE.md 2022-05-20 02:11:49 +02:00
maggi373
9ec2b2822d make enrichedalloy more sense 2022-05-01 23:12:51 +02:00
maggi373
c4872f6737 fix maven publish action 2022-05-01 16:22:38 +02:00
maggi373
a77e441ca5 fix maven groupid error 2022-05-01 14:43:46 +02:00
maggi373
54f05cba40 add cm to the rest of modules 2022-05-01 02:40:52 +02:00
maggi373
acf8a80b77 fix typos in mcmod.info 2022-05-01 02:40:09 +02:00
maggi373
1333d2fcf1 proper name in pom 2022-04-30 20:55:52 +02:00
maggi373
76bca6497b fix code check 2022-04-30 20:17:21 +02:00
maggi373
0f049b7a1c update building desc
yes fullBuild is default, but just to remind people
2022-04-30 20:09:48 +02:00
maggi373
f0f3cbf87a fix up gradle
fixes maven stuff
also fixes gradle building
2022-04-30 20:07:36 +02:00
maggi373
817dbebf47 use fullbuild 2022-04-30 19:55:42 +02:00
maggi373
1612795a5f update gradle 2022-04-30 19:55:28 +02:00
maggi373
80bd73dd62 add maven stuff 2022-04-29 02:13:20 +02:00
maggi373
e9ab1095df update versioning 2022-04-29 01:57:15 +02:00
Magnar Polden
5a2fc5a25f cleanup of lib files 2022-03-01 23:55:38 +01:00
Magnar Polden
a8f4ed8f90 Update build.gradle 2022-03-01 22:53:54 +01:00
Magnar Polden
b24d45ec26 add our own repos 2022-03-01 21:01:57 +01:00
Magnar Polden
af03307bf9 update lib 2022-02-19 02:25:13 +01:00