Merged branch master into master

This commit is contained in:
Jared 2016-10-18 13:10:26 +02:00
commit 018290cee5
5 changed files with 19 additions and 19 deletions

View file

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2014 joshiejack
Copyright (c) 2016 Jaredlll08
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

View file

@ -22,7 +22,7 @@ configFile.withReader {
project.ext.config = new ConfigSlurper().parse prop
}
version=config.mod.version
version=config.minecraft.version + "-" + config.mod.version
group= "modtweaker" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ModTweaker2"

View file

@ -1,4 +1,4 @@
minecraft.version=1.10.2
forge.version=1.10.2-12.18.0.2005-1.10.0
forge.version=1.10.2-12.18.1.2094
mod.version=2.0.3
mod.version=2.0.4

View file

@ -1,16 +1,16 @@
[
{
"modid": "modtweaker",
"name": "Mod Tweaker",
"description": "ModTweaker is an addon for CraftTweaker.",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "",
"updateUrl": "",
"authorList": ["Jaredlll08"],
"credits": "joshie and Spitefulfox for writing ModTweaker, yulife for documentation.",
"logoFile": "",
"screenshots": [],
"dependencies": []
}
{
"modid": "modtweaker",
"name": "Mod Tweaker",
"description": "ModTweaker is an addon for CraftTweaker, a recipe manipulator utility for Minecraft. It allows you to modify the recipes of other mods that add their own crafting mechanics",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "https://minecraft.curseforge.com/projects/ModTweaker",
"updateUrl": "https://minecraft.curseforge.com/projects/ModTweaker/files",
"authorList": ["Jaredlll08", "SnowShock35"],
"credits": "Joshie and SpitefulFox for writing ModTweaker, Yulife for documentation.",
"logoFile": "",
"screenshots": [],
"dependencies": []
}
]