-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to 1.14.4; semi-fix Energy Conduits
- Loading branch information
1 parent
9e24861
commit a8dd8af
Showing
10 changed files
with
104 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,87 @@ | ||
| plugins { | ||
| id 'fabric-loom' version '0.2.4-SNAPSHOT' | ||
| id 'fabric-loom' version '0.2.4-SNAPSHOT' | ||
| } | ||
|
|
||
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
|
|
||
| archivesBaseName = "vivatech" | ||
| version = "1.0.0-alpha.10" | ||
| version = "1.0.0-alpha.10+1.14.4" | ||
|
|
||
| repositories { | ||
| jcenter() | ||
| maven { | ||
| name = "Fabric" | ||
| url = "http://maven.fabricmc.net" | ||
| } | ||
| maven { | ||
| name = "Cotton (Snapshot)" | ||
| url = "http://server.bbkr.space:8081/artifactory/libs-snapshot" | ||
| } | ||
| maven { | ||
| name = "Cotton" | ||
| url "http://server.bbkr.space:8081/artifactory/libs-release" | ||
| } | ||
| maven { | ||
| name = "BuildCraft" | ||
| url = "https://mod-buildcraft.com/maven" | ||
| } | ||
| maven { | ||
| name = "BuildCraft" | ||
| url = "https://minecraft.curseforge.com/api/maven" | ||
| } | ||
| jcenter() | ||
| maven { | ||
| name = "Fabric" | ||
| url = "http://maven.fabricmc.net" | ||
| } | ||
| maven { | ||
| name = "Cotton (Snapshot)" | ||
| url = "http://server.bbkr.space:8081/artifactory/libs-snapshot" | ||
| } | ||
| maven { | ||
| name = "Cotton" | ||
| url "http://server.bbkr.space:8081/artifactory/libs-release" | ||
| } | ||
| maven { | ||
| name = "BuildCraft" | ||
| url = "https://mod-buildcraft.com/maven" | ||
| } | ||
| maven { | ||
| name = "BuildCraft" | ||
| url = "https://minecraft.curseforge.com/api/maven" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| minecraft "com.mojang:minecraft:1.14.3" | ||
| mappings "net.fabricmc:yarn:1.14.3+build.12" | ||
| modImplementation "net.fabricmc:fabric-loader:0.4.8+build.155" | ||
| modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.194" | ||
| minecraft "com.mojang:minecraft:1.14.4" | ||
| mappings "net.fabricmc:yarn:1.14.4+build.2" | ||
| modImplementation "net.fabricmc:fabric-loader:0.4.8+build.157" | ||
| modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.200" | ||
|
|
||
| // javax.annotations.* | ||
| compileOnly "com.google.code.findbugs:jsr305:3.0.2" | ||
| // javax.annotations.* | ||
| compileOnly "com.google.code.findbugs:jsr305:3.0.2" | ||
|
|
||
| modApi "alexiil.mc.lib:libblockattributes-all:0.4.7" | ||
| modApi "io.github.cottonmc:LibGui:1.1.0" | ||
| modApi "io.github.cottonmc:Jankson:1.0.0-j1.1.2" | ||
| modApi "io.github.cottonmc.cotton:cotton-logging:1.0.0-rc.1" | ||
| modApi "io.github.cottonmc.cotton:cotton-config:1.0.0-rc.1" | ||
| modApi "io.github.cottonmc.cotton:cotton-datapack:1.0.0-rc.1" | ||
| modApi "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" | ||
| modApi "io.github.cottonmc:cotton-resources:1.2.2+1.14.2" | ||
| modApi "alexiil.mc.lib:libblockattributes-all:0.4.9" | ||
| modApi "io.github.cottonmc:LibGui:1.1.0" | ||
| modApi "io.github.cottonmc:Jankson:1.0.0-j1.1.2" | ||
| modApi "io.github.cottonmc.cotton:cotton-logging:1.0.0-rc.1" | ||
| modApi "io.github.cottonmc.cotton:cotton-config:1.0.0-rc.1" | ||
| modApi "io.github.cottonmc.cotton:cotton-datapack:1.0.0-rc.1" | ||
| modApi "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" | ||
| modApi "io.github.cottonmc:cotton-resources:1.3.3+1.14.3" | ||
|
|
||
| include "alexiil.mc.lib:libblockattributes-all:0.4.7" | ||
| include "io.github.cottonmc:LibGui:1.1.0" | ||
| include "io.github.cottonmc:Jankson:1.0.0-j1.1.2" | ||
| include "io.github.cottonmc.cotton:cotton-logging:1.0.0-rc.1" | ||
| include "io.github.cottonmc.cotton:cotton-config:1.0.0-rc.1" | ||
| include "io.github.cottonmc.cotton:cotton-datapack:1.0.0-rc.1" | ||
| include "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" | ||
| include "io.github.cottonmc:cotton-resources:1.2.2+1.14.2" | ||
| include "alexiil.mc.lib:libblockattributes-all:0.4.9" | ||
| include "io.github.cottonmc:LibGui:1.1.0" | ||
| include "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" | ||
| include "io.github.cottonmc:cotton-resources:1.3.3+1.14.3" | ||
|
|
||
| // Integration tests | ||
| modImplementation ("me.shedaniel:RoughlyEnoughItems:2.9.6+build.139") { transitive = false } | ||
| modImplementation ("io.github.prospector:modmenu:1.6.3+build.101") { transitive = false } | ||
| // Integration tests | ||
| modImplementation ("me.shedaniel:RoughlyEnoughItems:2.9.7+build.140") { transitive = false } | ||
| // modImplementation ("io.github.prospector:modmenu:1.6.3+build.101") { transitive = false } | ||
| } | ||
|
|
||
| processResources { | ||
| inputs.property "version", project.version | ||
| inputs.property "version", project.version | ||
|
|
||
| from(sourceSets.main.resources.srcDirs) { | ||
| include "fabric.mod.json" | ||
| expand "version": project.version | ||
| } | ||
| from(sourceSets.main.resources.srcDirs) { | ||
| include "fabric.mod.json" | ||
| expand "version": project.version | ||
| } | ||
|
|
||
| from(sourceSets.main.resources.srcDirs) { | ||
| exclude "fabric.mod.json" | ||
| } | ||
| from(sourceSets.main.resources.srcDirs) { | ||
| exclude "fabric.mod.json" | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding = "UTF-8" | ||
| options.encoding = "UTF-8" | ||
| } | ||
|
|
||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| classifier = "sources" | ||
| from sourceSets.main.allSource | ||
| classifier = "sources" | ||
| from sourceSets.main.allSource | ||
| } | ||
|
|
||
| jar { | ||
| from "LICENSE" | ||
| from "LICENSE" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,30 @@ | ||
| { | ||
| "itemGroup.vivatech.item_group": "Vivatech", | ||
|
|
||
| "block.vivatech.minimal_machine_chassis" : "Minimal Machine Chassis", | ||
| "block.vivatech.minimal_machine_chassis": "Minimal Machine Chassis", | ||
| "block.vivatech.normal_machine_chassis": "Normal Machine Chassis", | ||
| "block.vivatech.advanced_machine_chassis" : "Advanced Machine Chassis", | ||
| "block.vivatech.advanced_machine_chassis": "Advanced Machine Chassis", | ||
|
|
||
| "block.vivatech.coal_generator": "Coal Generator", | ||
| "block.vivatech.crusher": "Crusher", | ||
| "block.vivatech.electric_furnace": "Electric Furnace", | ||
| "block.vivatech.press": "Press", | ||
| "block.vivatech.energy_bank": "Energy Bank", | ||
| "block.vivatech.energy_conduit": "Energy Conduit", | ||
| "block.vivatech.press": "Press", | ||
|
|
||
| "item.vivatech.battery" : "Battery", | ||
| "item.vivatech.battery": "Battery", | ||
| "item.vivatech.screwdriver": "Screwdriver", | ||
|
|
||
| "gui.vivatech.crushing" : "Crushing", | ||
| "gui.vivatech.pressing" : "Pressing", | ||
| "gui.vivatech.cutting": "Cutting", | ||
| "gui.vivatech.crushing": "Crushing", | ||
| "gui.vivatech.pressing": "Pressing", | ||
|
|
||
| "info.vivatech.energy": "%d J", | ||
| "info.vivatech.energy_cost": "Energy: %d J", | ||
| "info.vivatech.energy_with_max": "%d/%d J", | ||
| "info.vivatech.energy_cost" : "Energy: %d J", | ||
|
|
||
| "info.vivatech.tier" : "Tier: %s", | ||
| "info.vivatech.tier.minimal" : "Minimal", | ||
| "info.vivatech.tier.normal" : "Normal", | ||
| "info.vivatech.tier.advanced" : "Advanced" | ||
| "info.vivatech.tier": "Tier: %s", | ||
| "info.vivatech.tier.minimal": "Minimal", | ||
| "info.vivatech.tier.normal": "Normal", | ||
| "info.vivatech.tier.advanced": "Advanced" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,30 @@ | ||
| { | ||
| "itemGroup.vivatech.item_group": "Vivatech", | ||
|
|
||
| "block.vivatech.minimal_machine_chassis" : "Минимальный Корпус Машины", | ||
| "block.vivatech.minimal_machine_chassis": "Минимальный Корпус Машины", | ||
| "block.vivatech.normal_machine_chassis": "Обычный Корпус Машины", | ||
| "block.vivatech.advanced_machine_chassis" : "Продвинутый Корпус Машины", | ||
| "block.vivatech.advanced_machine_chassis": "Продвинутый Корпус Машины", | ||
|
|
||
| "block.vivatech.coal_generator": "Угольный Генератор", | ||
| "block.vivatech.crusher": "Дробитель", | ||
| "block.vivatech.electric_furnace": "Электропечь", | ||
| "block.vivatech.press": "Пресс", | ||
| "block.vivatech.energy_bank": "Энергохранилище", | ||
| "block.vivatech.energy_conduit": "Труба для Энергии", | ||
| "block.vivatech.press": "Пресс", | ||
|
|
||
| "item.vivatech.battery" : "Батарея", | ||
| "item.vivatech.battery": "Батарея", | ||
| "item.vivatech.screwdriver": "Отвёртка", | ||
|
|
||
| "gui.vivatech.crushing" : "Дробление", | ||
| "gui.vivatech.pressing" : "Прессование", | ||
| "gui.vivatech.cutting": "Резка", | ||
| "gui.vivatech.crushing": "Дробление", | ||
| "gui.vivatech.pressing": "Прессование", | ||
|
|
||
| "info.vivatech.energy": "%d Дж", | ||
| "info.vivatech.energy_with_max": "%d/%d Дж", | ||
| "info.vivatech.energy_cost" : "Энергия: %d Дж", | ||
| "info.vivatech.energy_with_max": "%d/%d Дж", | ||
|
|
||
| "info.vivatech.tier" : "Уровень: %s", | ||
| "info.vivatech.tier.minimal" : "Минимальный", | ||
| "info.vivatech.tier.normal" : "Обычный", | ||
| "info.vivatech.tier.advanced" : "Продвинутый" | ||
| "info.vivatech.tier": "Уровень: %s", | ||
| "info.vivatech.tier.minimal": "Минимальный", | ||
| "info.vivatech.tier.normal": "Обычный", | ||
| "info.vivatech.tier.advanced": "Продвинутый" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "ores": [ "cobalt", "copper", "steel", "tungsten" ] | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters