Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts: # src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java # src/main/java/techreborn/client/container/ContainerPda.java # src/main/java/techreborn/client/gui/TRBuilder.java # src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java # src/main/java/techreborn/compat/crafttweaker/CTGeneric.java # src/main/java/techreborn/compat/jei/RecipeUtil.java # src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java # src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java # src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java # src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java # src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java # src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java # src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java # src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java # src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java # src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java # src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java # src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java # src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java # src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java # src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java # src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java # src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java # src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java # src/main/java/techreborn/init/ModBlocks.java # src/main/java/techreborn/init/ModTileEntities.java # src/main/java/techreborn/init/recipes/CraftingTableRecipes.java # src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java # src/main/java/techreborn/items/tools/ItemAdvancedDrill.java # src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java # src/main/resources/assets/techreborn/lang/en_us.lang # src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json # src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json # src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json # src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json # src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json # src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
This commit is contained in:
commit
6060a97855
77 changed files with 1863 additions and 4017 deletions
43
build.gradle
43
build.gradle
|
@ -1,6 +1,7 @@
|
|||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
maven {
|
||||
name = "forge"
|
||||
url = "http://files.minecraftforge.net/maven"
|
||||
|
@ -16,6 +17,7 @@ buildscript {
|
|||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
|
||||
classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
|
||||
classpath 'de.undercouch:gradle-download-task:3.4.3'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -23,6 +25,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
|
|||
apply plugin: 'maven'
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: net.minecrell.gradle.licenser.Licenser
|
||||
apply plugin: 'de.undercouch.download'
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
|
@ -35,7 +38,7 @@ repositories {
|
|||
}
|
||||
}
|
||||
|
||||
version = "2.16.2"
|
||||
version = "2.17.3"
|
||||
|
||||
def ENV = System.getenv()
|
||||
if (ENV.BUILD_NUMBER) {
|
||||
|
@ -111,6 +114,9 @@ jar {
|
|||
manifest {
|
||||
attributes 'FMLAT': 'techreborn_at.cfg'
|
||||
}
|
||||
|
||||
from { crowdin.getDidWork() ? fileTree('build/translations').matching{exclude "**/en_US.lang"} : null}
|
||||
dependsOn 'renameCrowdin'
|
||||
}
|
||||
|
||||
task apiJar(type: Jar) {
|
||||
|
@ -125,6 +131,41 @@ apiJar.mustRunAfter deobfJar
|
|||
|
||||
build.dependsOn deobfJar, apiJar
|
||||
|
||||
//Triggers crowdin to export the latest translations
|
||||
task crowdinExport() {
|
||||
onlyIf {
|
||||
project.hasProperty('crowdinKey')
|
||||
}
|
||||
doLast{
|
||||
def apiKey = project.crowdinKey
|
||||
def projectId = 'techreborn'
|
||||
def response = new URL(sprintf('https://api.crowdin.com/api/project/%1$s/export?key=%2$s', [projectId, apiKey])).text
|
||||
def metadata = new XmlParser().parseText(response)
|
||||
project.logger.lifecycle("crowdin export status: " + metadata.@status)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
task crowdin(type: Download, dependsOn: 'crowdinExport'){
|
||||
src 'https://crowdin.com/backend/download/project/techreborn.zip'
|
||||
dest file("build/translations.zip")
|
||||
overwrite true
|
||||
}
|
||||
|
||||
task cleanCrowdin(type: Delete){
|
||||
delete 'build/translations'
|
||||
}
|
||||
|
||||
//Renames the translation files to be all lower case
|
||||
task renameCrowdin(type: Copy, dependsOn: ['crowdin', 'cleanCrowdin']){
|
||||
mustRunAfter 'crowdin'
|
||||
from zipTree(file("build/translations.zip"))
|
||||
into file('build/translations')
|
||||
rename {
|
||||
String filename -> return filename.toLowerCase()
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
maven(MavenPublication) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue