Skip to content

Commit f95512f

Browse files
authored
Merge pull request #9 from MrKono/1.2.2
1.2.2
2 parents 9d8e924 + 1317db1 commit f95512f

File tree

6 files changed

+21
-3
lines changed

6 files changed

+21
-3
lines changed

ChangeLog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
# ChangeLog (更新履歴)
2+
## v 1.2.2
3+
**_EN_** <br>
4+
**Update**<br>
5+
***GTCEu 2.8.1-beta -> 2.8.6-beta***<br>
6+
**add**<br>
7+
- Add Large Machine (Deconstructor and Scrapper)<br>
8+
- Add recycling recipe
9+
10+
**_JP_** <br>
11+
**Update**<br>
12+
***GTCEu 2.8.1-beta -> 2.8.6-beta***<br>
13+
**追加**<br>
14+
- 大型機械を追加 (分解機とスクラップ製造機)<br>
15+
- リサイクルレシピを追加
16+
----------
217
## v 1.2.1
318
**_EN_** <br>
419
**Update**<br>

VersionInformation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Corresponding Version Information / 対応バージョン情報
22
| MaterialReplication | GTCEu |
33
|---------------------|------------|
4+
| 1.2.2 | 2.8.6-beta |
45
| 1.2.0 <br> 1.2.1 | 2.8.1-bata |
56
| 1.1.1 | 2.7.4-beta |
67
| 1.1.0 | 2.7.2-beta |

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
dependencies {
2525
implementation rfg.deobf("curse.maven:codechicken-lib-1-8-242818:2779848") // CCL 3.2.3.358
26-
implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:4965457") // CEu 2.8.5
26+
implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5050979") // CEu 2.8.6
2727
implementation rfg.deobf("curse.maven:gregicality-multiblocks-564858:4910674") // GCYM 1.2.7
2828

2929
implementation "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.684" // CrT 4.1.20.684

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ modGroup = kono.ceu.materialreplication
77

88
# Version of your mod.
99
# This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
10-
modVersion = 1.2.1
10+
modVersion = 1.2.2
1111

1212
# Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
1313
includeMCVersionJar = false

src/main/java/kono/ceu/materialreplication/MRConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static class ScrapOptions {
115115
}
116116

117117
public static class RecipeOptions {
118-
@Config.Comment({"Whether to add the UUMatter recipe.", "If you install Gregification and Forestry, this will be ignored.",
118+
@Config.Comment({"Whether to add the UUMatter recipe.", "If you install Forestry and, this will be ignored.",
119119
"Default : false"})
120120
public boolean addUUMatterRecipe = false;
121121
}

src/main/java/kono/ceu/materialreplication/common/CommonProxy.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package kono.ceu.materialreplication.common;
22

33

4+
import gregtech.loaders.recipe.RecyclingRecipes;
45
import kono.ceu.materialreplication.api.util.MRValues;
56
import kono.ceu.materialreplication.api.util.MaterialReplicationLog;
67
import kono.ceu.materialreplication.common.items.MRMetaItems;
@@ -63,6 +64,7 @@ public static void registerRecipesRemoval(RegistryEvent.Register<IRecipe> event)
6364
public static void registerRecipesLow(RegistryEvent.Register<IRecipe> event){
6465
MaterialReplicationLog.logger.info("Registering recipes...");
6566
MRRecipes.addRecipe();
67+
RecyclingRecipes.init();
6668
}
6769
}
6870

0 commit comments

Comments
 (0)