Commit graph

3833 commits

Author SHA1 Message Date
9de6a1e648 feat: added UniversalElectricity compat 2022-11-01 18:47:33 +01:00
a09f0cfd16 fix: universal cable connection to IC2 2022-10-30 12:45:21 +01:00
fc99bccc9a fix: config option was never read 2022-10-28 22:49:58 +02:00
88473f7657 Merge branch '1.7.10' of ssh://git.tilera.org:2222/tilera/Mekanism-1.7.10-Community-Edition into 1.7.10 2022-10-09 13:43:53 +02:00
2019c3e20a Added back Theoretical Elementizer 2022-10-09 13:17:14 +02:00
maggi373
556ff54906
clarify license 2022-09-24 23:06:02 +02:00
maggi373
9c403319c9
Update README.md 2022-09-13 17:20:48 +02:00
maggi373
fbe3f06f4b
Update README.md 2022-09-13 17:12:17 +02:00
maggi373
c0c8f0b1b1
Update README.md 2022-09-13 17:08:57 +02:00
maggi373
6160b5b135
Merge pull request #36 from DrParadox7/1.7.10-CommunityEdition
A cleaner merge of my changes
2022-09-13 16:44:57 +02:00
TechnoParadox
a8944e0b90 Remove redundant oredict fix 2022-09-13 16:35:58 +02:00
TechnoParadox
282c21d3cb Add Methane to gas burner fuel list 2022-09-11 19:57:26 +02:00
TechnoParadox
d32bb14c28 Cardboard Boxes are now single use 2022-09-11 19:35:08 +02:00
TechnoParadox
524fa01b11 Missing Lang for Teleporter 2022-09-11 19:32:47 +02:00
TechnoParadox
9bca7c6481 More configs for Heat Generator
Regulate Heat Generator efficiency
Enable/Disable Heat Generator ability to output heat
2022-09-11 19:30:43 +02:00
TechnoParadox
de284aa1c4 Allow reduce particle from completed multiblocks
Users can now reduce particle effects emitted from completed multiblocks.
May enhance performance.
2022-09-11 19:30:00 +02:00
TechnoParadox
f922b8c8b1 Oredictionary for Metallurgic infuser + Sawmill balance
Metallurgic Infuser now accepts any diamond oredictionary.
Fix Sawmill outputting ready-made rubber from logs instead of resin.
2022-09-11 19:28:30 +02:00
TechnoParadox
a6cb74522c Added Methane Gas 2022-09-11 18:54:35 +02:00
TechnoParadox
0404919601 Nerf Fusion Reactor
From 200k+ RF/t to around 1.5k RF/t on lower injection rates.
2022-09-11 18:48:23 +02:00
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