 maggi373
|
72a51031c0
|
add release support for new modules
|
2026-09-26 16:07:15 +02:00 |
|
|
maggi373
|
c2beb3e4e6
|
Merge pull request #279 from Omgise/1.7.10
Update zh_CN.lang
|
2026-09-26 15:45:50 +02:00 |
|
|
maggi373
|
874c87d0c2
|
Merge pull request #276 from Thorfusion/fg-migration-1.7.10
Move to RetroFuturaGradle
|
2026-09-24 01:44:23 +02:00 |
|
|
maggi373
|
a5ec223fc1
|
Move to RetroFuturaGradle
|
2026-09-19 23:49:09 +02:00 |
|
|
maggi373
|
41a53f0923
|
fix new issue with sawmill
|
2026-09-19 15:37:36 +02:00 |
|
|
maggi373
|
c0da7b1bd3
|
add sawmill factories
|
2026-09-19 15:16:54 +02:00 |
|
|
maggi373
|
ac1b9210ae
|
update workflow to work with 1.12.2
|
2026-09-19 14:00:35 +02:00 |
|
|
maggi373
|
e0bacf7fbc
|
bump version
|
2026-09-19 13:40:39 +02:00 |
|
|
maggi373
|
3cad4a220e
|
add ultimate config
|
2026-09-19 13:38:56 +02:00 |
|
|
maggi373
|
600bb02226
|
fix mixing upload jars
|
2026-09-19 13:27:18 +02:00 |
|
|
maggi373
|
1211b57356
|
Merge pull request #274 from Thorfusion/add-ultimate-factories-on-1.7.10-ultimate-module
Add ultimate factories on 1.7.10 ultimate module
|
2026-09-16 22:30:16 +02:00 |
|
|
maggi373
|
857c6e87b5
|
bump version
|
2026-09-16 22:27:01 +02:00 |
|
|
maggi373
|
b101faf4e7
|
Merge branch '1.7.10' into add-ultimate-factories-on-1.7.10-ultimate-module
|
2026-09-16 22:26:30 +02:00 |
|
|
maggi373
|
6ce96b1461
|
shorten release names
|
2026-09-16 22:25:29 +02:00 |
|
|
maggi373
|
4f9cbcbaea
|
add missing modules to all
|
2026-09-16 22:25:15 +02:00 |
|
|
maggi373
|
912ca529a2
|
fix missing name
|
2026-09-16 22:08:36 +02:00 |
|
|
maggi373
|
936e7b8114
|
fix gui
|
2026-09-16 22:02:24 +02:00 |
|
|
maggi373
|
96e627c5d3
|
add ultimate factories
first test
|
2026-09-16 19:53:11 +02:00 |
|
|
maggi373
|
5ec29e83ce
|
remove concurrency
|
2026-09-16 19:27:19 +02:00 |
|
|
maggi373
|
511605cc1d
|
bump versions
|
2026-09-16 19:22:10 +02:00 |
|
|
maggi373
|
66d2522dea
|
Merge pull request #273 from Thorfusion/263-enhancement-fix-arr-textures-in-defensetech-module
update defensetech textures
|
2026-09-16 19:21:38 +02:00 |
|
|
maggi373
|
dc88525536
|
update workflow
|
2026-09-16 19:14:46 +02:00 |
|
|
maggi373
|
2018f83664
|
update defensetech textures
feel free to imrpove these
|
2026-09-16 00:24:14 +02:00 |
|
|
maggi373
|
9e8f878392
|
Update maven.yml
|
2026-09-08 20:05:16 +02:00 |
|
|
maggi373
|
77ce4f0609
|
maybe, just maybe an fix for #261
who knows, it might just work
or go down in flames
but atleast it did something
|
2026-03-20 18:33:31 +01:00 |
|
|
maggi373
|
86ccb9b180
|
change recipe for teleportation core to ender pearl
|
2026-03-18 23:31:04 +01:00 |
|
|
maggi373
|
8fbbf87534
|
add defensetech bug template
|
2026-03-18 22:44:54 +01:00 |
|
|
maggi373
|
e36103f912
|
add support for ultimate module
from 3 years ago lol
|
2026-03-17 21:33:12 +01:00 |
|
|
maggi373
|
fba6bf33f2
|
fix build issues with defensetech
|
2026-03-17 21:22:36 +01:00 |
|
|
maggi373
|
449a2bba19
|
Make sure erroring Missiles are killed off.
credits: clienthax
|
2026-03-17 21:06:27 +01:00 |
|
|
maggi373
|
5f4c40e6ea
|
remove threadgetdata call
|
2026-03-17 21:02:15 +01:00 |
|
|
maggi373
|
be3cd50b79
|
add defensetech module
license: ARR
also removed threadgetdata
updatenotifier that isnt needed
|
2026-03-17 21:01:45 +01:00 |
|
|
maggi373
|
38482d09b0
|
add defensetech to license
|
2026-03-17 20:47:15 +01:00 |
|
|
maggi373
|
923ceaec32
|
fix npe in rendering of boilercasing #208
|
2026-02-24 22:38:46 +01:00 |
|
|
maggi373
|
d83eaeda81
|
fix nei issue with mariculture in #223
|
2026-02-24 22:22:36 +01:00 |
|
|
maggi373
|
d5ef67f56c
|
fix npe with ic2
|
2026-02-24 22:13:08 +01:00 |
|
|
maggi373
|
99b3d9f707
|
fix #235 npe
|
2026-02-24 21:50:52 +01:00 |
|
|
maggi373
|
76ae49ba94
|
Merge pull request #245 from Thorfusion/remove-updatenotifier
remove update notifier
|
2026-02-24 21:19:17 +01:00 |
|
|
maggi373
|
fd33d689cf
|
remove removed commands from help command
|
2026-02-24 21:18:54 +01:00 |
|
|
maggi373
|
ff9dd0a454
|
bump version
|
2026-02-24 21:18:27 +01:00 |
|
|
maggi373
|
088e0a1f6f
|
Merge branch '1.7.10' into remove-updatenotifier
|
2026-02-24 20:11:13 +01:00 |
|
|
maggi373
|
3d1957fb16
|
Merge pull request #246 from Thorfusion/243-bug-91047-crashes-on-startup-due-to-missing-deploader-class
243 bug 91047 crashes on startup due to missing deploader class fix
|
2026-02-24 20:11:00 +01:00 |
|
|
maggi373
|
ad19dc216c
|
remove update notifier
|
2026-02-24 19:58:53 +01:00 |
|
|
maggi373
|
e1b569fbac
|
remove unused loadinghook
|
2026-02-24 19:58:02 +01:00 |
|
|
maggi373
|
66c3031579
|
fix #243
|
2026-02-24 19:57:38 +01:00 |
|
|
maggi373
|
d1f8b7771c
|
Merge branch '1.7.10' of https://github.com/Thorfusion/Mekanism-Community-Edition into 1.7.10
|
2026-02-21 23:36:22 +01:00 |
|
|
maggi373
|
857f54d196
|
bump version
|
2026-02-21 23:36:11 +01:00 |
|
|
maggi373
|
702f772ef2
|
Merge pull request #242 from Thorfusion/StackOverflow
Fix for Multiblock StackOverflow
|
2026-02-21 23:33:53 +01:00 |
|
|
maggi373
|
92b6271b32
|
remove deploader
|
2026-02-21 23:33:30 +01:00 |
|
|
maggi373
|
c7161c9014
|
remove required dependencies
|
2026-02-21 23:33:18 +01:00 |
|
|
maggi373
|
b2f705d80a
|
Update Mekanism.txt
|
2025-10-01 19:53:28 +02:00 |
|
|
maggi373
|
1c5cd022b4
|
Update gradle.properties
|
2025-10-01 19:53:17 +02:00 |
|
|
maggi373
|
58647017b5
|
Merge pull request #231 from brandyyn/1.7.10
remove redundant HP durability tooltips
|
2025-10-01 19:38:18 +02:00 |
|
|
maggi373
|
8b784446df
|
Merge pull request #221 from SpoilersMC/1.7.10
Change jetpack check method for parity
|
2025-07-26 00:47:54 +02:00 |
|
|
maggi373
|
9d57030236
|
Merge pull request #218 from Thorfusion/EquipCfg
Equipment Config and UI Fixes
|
2025-06-17 23:18:26 +02:00 |
|
|
maggi373
|
35a9e07eaa
|
Merge pull request #217 from Thorfusion/laserHeatCfg
New Config: Laser Heat Coefficient
|
2025-05-28 23:39:50 +02:00 |
|
|
maggi373
|
b38d1fd43f
|
Update Mekanism.txt
|
2025-04-23 14:39:39 +02:00 |
|
|
maggi373
|
a245ca3b32
|
bump version
|
2025-04-20 23:21:38 +02:00 |
|
|
maggi373
|
197cbf1801
|
Merge pull request #203 from SpoilersMC/1.7.10
Update Mekanism holder blocks to support Digital Miner
|
2025-01-19 02:32:23 +01:00 |
|
|
maggi373
|
13db7cb1df
|
Merge pull request #202 from SpoilersMC/1.7.10
Correct wrong perfection check in digital miner
|
2025-01-05 15:56:09 +01:00 |
|
|
maggi373
|
7ece19eaa3
|
bump version
|
2024-12-13 17:04:55 +01:00 |
|
|
maggi373
|
71be7aa259
|
Merge pull request #199 from SpoilersMC/1.7.10
Improve Digital Miner ItemStack perfection checks
|
2024-12-10 23:22:10 +01:00 |
|
|
maggi373
|
b0f8a6b742
|
Merge pull request #196 from LoLoAlexLoLo/patch-1
Update ru_RU.lang
|
2024-12-10 23:21:57 +01:00 |
|
|
maggi373
|
1317cc5bb4
|
Merge pull request #195 from SpoilersMC/1.7.10
Add Fusion output config option
|
2024-11-25 17:59:56 +01:00 |
|
|
maggi373
|
aa5102a342
|
Merge pull request #194 from Thorfusion/NPE-Fix
Fix Turbine Casing NPE
|
2024-11-25 04:39:22 +01:00 |
|
|
maggi373
|
6852f791e6
|
Merge pull request #191 from Omgise/1.7.10
Update zh_CN.lang
|
2024-10-20 03:36:29 +02:00 |
|
|
maggi373
|
fc533d1b0f
|
Merge pull request #193 from Thorfusion/continue-efr-support
Continue efr support
|
2024-10-20 03:35:47 +02:00 |
|
|
maggi373
|
29e601516c
|
reenable combiner by default again
should be disabled by modpack devs tho
|
2024-10-20 03:33:09 +02:00 |
|
|
maggi373
|
8df77409d5
|
combiner is now disabled by default
its just a dupe machine
|
2024-10-18 22:12:23 +02:00 |
|
|
maggi373
|
49cfc4baba
|
add disable combiner on dust to ore aswell
|
2024-10-18 22:11:32 +02:00 |
|
|
maggi373
|
4bb603bf3a
|
Revert "remove combiner recipe for ores"
This reverts commit ee9b452376.
|
2024-10-18 22:09:58 +02:00 |
|
|
maggi373
|
6f53d66a47
|
disable combiner recipes aswell
|
2024-10-18 22:09:50 +02:00 |
|
|
maggi373
|
ee9b452376
|
remove combiner recipe for ores
|
2024-10-18 21:45:37 +02:00 |
|
|
maggi373
|
a39d95bce1
|
fix missing tooltip on deepslate ores
|
2024-10-18 19:49:12 +02:00 |
|
|
maggi373
|
d73fe8d8b8
|
add support for rawpoor ores
|
2024-10-18 16:28:04 +02:00 |
|
|
maggi373
|
2165df77b2
|
Merge pull request #192 from Thorfusion/1.7.10
update dev
|
2024-10-18 16:14:35 +02:00 |
|
|
maggi373
|
7962902f5a
|
Merge pull request #190 from Thorfusion/continue-efr-support
Continue efr support
|
2024-10-18 04:17:09 +02:00 |
|
|
maggi373
|
178a2fe281
|
fix configs being in wrong file
|
2024-10-18 04:13:58 +02:00 |
|
|
maggi373
|
129d58cc6c
|
fix catogory of enabledeepslateosmium
|
2024-10-18 04:09:01 +02:00 |
|
|
maggi373
|
7a35d46404
|
add config for oredict on raw osmium
|
2024-10-18 03:41:42 +02:00 |
|
|
maggi373
|
82ce1cf74d
|
add raw ore oredict support
|
2024-10-18 03:35:06 +02:00 |
|
|
maggi373
|
9b7907a6c1
|
Merge pull request #189 from Thorfusion/dupefix-with-efr
fix for dupe with efr extraDropRawOres
|
2024-10-18 03:13:55 +02:00 |
|
|
maggi373
|
7e9cbf405d
|
fix for dupe with efr extraDropRawOres
|
2024-10-18 03:13:10 +02:00 |
|
|
maggi373
|
6be5daf6d2
|
Merge pull request #188 from Thorfusion/add-further-efr-support
Add further efr support
|
2024-10-17 22:14:49 +02:00 |
|
|
maggi373
|
92f91bdd0c
|
fix conflict with raw platinum block
|
2024-10-17 22:12:53 +02:00 |
|
|
maggi373
|
90f5a4bcc9
|
add raw osmium block
|
2024-10-17 22:00:02 +02:00 |
|
|
maggi373
|
7f957ea39d
|
fix recipe's not finding efr stuff for recipes
|
2024-10-17 21:59:40 +02:00 |
|
|
maggi373
|
6dafdec5ef
|
add raw osmium and efr support
|
2024-10-17 21:59:08 +02:00 |
|
|
maggi373
|
5368fd4fb8
|
update deepslate osmium ore texture
|
2024-10-17 21:57:39 +02:00 |
|
|
maggi373
|
279a270be2
|
Create RawOsmiumOre.png
|
2024-10-17 21:57:20 +02:00 |
|
|
maggi373
|
ffe683bc20
|
Create RawOsmiumBlock.png
|
2024-10-17 21:57:17 +02:00 |
|
|
maggi373
|
ac06c287b5
|
bump version
|
2024-10-17 21:57:08 +02:00 |
|
|
maggi373
|
423a97cee9
|
Merge pull request #187 from Thorfusion/185-enhancement-deepslate-variant-of-osmium-ore-when-efr-is-installed
Add deepslate ores and support for efr #185
|
2024-10-17 16:20:57 +02:00 |
|
|
maggi373
|
86d1b0052f
|
finish deepslate support
|
2024-10-17 16:15:39 +02:00 |
|
|
maggi373
|
7875d45c57
|
add deepslate tin and copper
|
2024-10-17 16:11:04 +02:00 |
|
|
maggi373
|
fd866eb894
|
add deepslate osmium
|
2024-10-17 01:43:27 +02:00 |
|
|
maggi373
|
a158a9ac02
|
add option to completly disable mekanism oregen
|
2024-10-17 00:42:25 +02:00 |
|
|
maggi373
|
e121baacea
|
add efr lib
|
2024-10-17 00:41:50 +02:00 |
|
|
maggi373
|
1c3770b26f
|
bump version
|
2024-10-17 00:41:39 +02:00 |
|
|
maggi373
|
9416e90a8c
|
change deepslate osmium texture name
|
2024-10-17 00:19:54 +02:00 |
|