Skip to content

Commit 8ed3f06

Browse files
committed
Update deps and bump min neo version to 21.0.6-beta
1 parent 87ce0f7 commit 8ed3f06

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import java.util.function.Consumer
1515
plugins {
1616
id('org.ajoberstar.grgit.service') version('5.2.2')
1717
id('net.darkhax.curseforgegradle') version('1.1.24')
18-
id('com.modrinth.minotaur') version('2.+')
18+
id('com.modrinth.minotaur') version('2.8.7')
1919
id('java')
2020
id('eclipse')
2121
id('idea')

gradle.properties

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ minecraft_version=1.21
99
previous_minecraft_version=1.20.4
1010
previous_minor_minecraft_version=1.20.6
1111
loader_version_range=[4,)
12-
forge_version=21.0.0-beta
12+
forge_version=21.0.6-beta
1313
mod_version=10.6.0
1414
#This determines the minimum version of forge required to use Mekanism
1515
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
16-
forge_version_range=[21.0.0-beta,)
16+
forge_version_range=[21.0.6-beta,)
1717
minecraft_version_range=[1.21]
1818
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1919
# options are: alpha, beta, release
@@ -36,14 +36,8 @@ recipe_viewer=emi
3636
yamlops_version=1.2.0
3737

3838
#Mod dependencies
39-
cc_tweaked_version=1.111.0
40-
crafttweaker_version=19.0.8
41-
curios_version=8.0.0-beta.5+1.20.6
42-
emi_version=1.1.6
43-
jade_api_id=5288706
44-
jade_id=5366595
45-
top_version=1.20.5_neo-11.1.1-2
46-
wthit_version=11.2.0
39+
jade_api_id=5427895
40+
jade_id=5427817
4741

4842
#Mod dependency min version ranges
4943

@@ -52,23 +46,29 @@ wthit_version=11.2.0
5246

5347

5448
#Mod dependencies for recipes (only used by our data generators)
55-
ae2_version=18.1.3-alpha
56-
biomesoplenty_version=18.4.0.7
57-
glitchcore_version=1.1.0.10
58-
terrablender_version=3.5.0.5
5949

60-
#Outdated mod dependencies
6150

51+
#Outdated mod dependencies
52+
cc_tweaked_version=1.111.0
53+
crafttweaker_version=19.0.8
54+
curios_version=8.0.0+1.20.6
6255
ctm_version=1.1.7+11
56+
emi_version=1.1.6
6357
flux_networks_id=5234697
6458
jei_version=17.3.0.52
6559
jeitweaker_version=8.0.5
6660
json_things_version=0.10.0
6761
oc2_id=3896581
6862
projecte_api_id=4860862
6963
recipe_stages_version=8.0.0.2
64+
top_version=1.20.5_neo-11.1.1-2
7065
wildfire_gender_mod_id=5357649
66+
wthit_version=11.3.0
7167

7268
#Outdated mod dependencies for recipes
69+
ae2_version=18.1.3-alpha
70+
biomesoplenty_version=18.4.0.7
7371
farmers_delight_id=5051242
72+
glitchcore_version=1.1.0.10
7473
projecte_id=4860859
74+
terrablender_version=3.5.0.5

src/tools/java/mekanism/tools/common/item/ItemMekanismSword.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
public class ItemMekanismSword extends SwordItem {
1414

1515
public ItemMekanismSword(MaterialCreator material, Item.Properties properties) {
16-
//TODO - 1.21: Ensure the patch to neo that adds a float variant gets added back in
17-
super(material, properties.attributes(createAttributes(material, (int) material.getSwordDamage(), material.getSwordAtkSpeed())));
16+
super(material, properties.attributes(createAttributes(material, material.getSwordDamage(), material.getSwordAtkSpeed())));
1817
}
1918

2019
@Override

0 commit comments

Comments
 (0)