forked from Thaumic-Tinkerer/ThaumicTinkerer
-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from GTNewHorizons/updatebuild
BY-NC-SA 3.0
- Loading branch information
Showing
9 changed files
with
461 additions
and
93 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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # This is the universal Text Editor Configuration | ||
| # for all GTNewHorizons projects | ||
| # See: https://editorconfig.org/ | ||
|
|
||
| root = true | ||
|
|
||
| [*] | ||
| charset = utf-8 | ||
| end_of_line = lf | ||
| indent_size = 4 | ||
| indent_style = space | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
|
|
||
| [*.{bat,ini}] | ||
| end_of_line = crlf | ||
|
|
||
| [*.{dtd,json,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}] | ||
| indent_size = 2 |
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,6 +1,7 @@ | ||
| .gradle | ||
| .settings | ||
| /.idea/ | ||
| /.vscode/ | ||
| /run/ | ||
| /build/ | ||
| /eclipse/ | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
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,21 +1,22 @@ | ||
|  | ||
|  | ||
|
|
||
| Welcome to the Thaumic Tinkerer Github Repo. | ||
|
|
||
| Thaumic Tinkerer is a Thaumcraft addon, it's intention is to add new content to Thaumcraft, and bring back some oldies, but goodies. | ||
|
|
||
| [Thaumic Tinkerer MCF Thread](http://www.minecraftforum.net/topic/1813058-) | ||
| [Thaumic Tinkerer MCF Thread](https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-mods/1289299-thaumic-tinkerer-thaumcraft-addon-evolve-knowledge-) | ||
|
|
||
| Thaumcraft © Azanor 2012 | ||
| [Thaumcraft MCF Thread](http://www.minecraftforum.net/topic/1585216-) | ||
| Thaumcraft © Azanor 2012-2015 | ||
| [Thaumcraft Curseforge Page](https://www.curseforge.com/minecraft/mc-mods/thaumcraft) | ||
|
|
||
| This mod is made with a Deobfuscated version of Thaumcraft, loaded as a Library. You can get a deobfuscated version of Thaumcraft using immibis' [Bearded Octo Nemesis](https://github.com/immibis/bearded-octo-nemesis). | ||
|  | ||
| This mod is made with a Deobfuscated version of Thaumcraft, loaded as a Library, and will automatically get one for you via `gradlew`. | ||
|
|
||
|  | ||
|
|
||
| Thaumic Tinkerer Was originally by Vazkii and is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) | ||
|
|
||
|
|
||
| # Fork | ||
| This mod was forked by the GT:NH Team to continue the development of the 1.7.10 Branch. | ||
| The up-to-date Master branch can be found on our Jenkins: | ||
| http://jenkins.usrv.de | ||
| This mod was forked by the GTNH Team to continue the development of the 1.7.10 Branch. | ||
|
|
||
| The up-to-date Master branch can be found on our [Jenkins](http://jenkins.usrv.eu:8080/job/Thaumic-Tinker/). |
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,49 +1,23 @@ | ||
| // Add your dependencies here | ||
|
|
||
| dependencies { | ||
| compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") | ||
| compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-76-GTNH:api") | ||
| compile('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') | ||
| compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-76-GTNH:api') | ||
|
|
||
| compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") | ||
| compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') | ||
|
|
||
| compileOnly("com.github.GTNewHorizons:Botania:1.9.1-GTNH:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:EnderCore:0.2.6:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:EnderStorage:1.4.11:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:waila:1.5.19:api") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.0.13-GTNH:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev") { | ||
| transitive = false | ||
| } | ||
| compileOnly("com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:api") { | ||
| transitive = false | ||
| } | ||
| compileOnly('com.github.GTNewHorizons:Botania:1.9.1-GTNH:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.29:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:EnderStorage:1.4.11:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:waila:1.5.19:api') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.9.0.13-GTNH:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:api') {transitive=false} | ||
|
|
||
| compileOnly("curse.maven:computercraft-67504:2269339") { | ||
| transitive = false | ||
| } | ||
| compileOnly("curse.maven:cofh-lib-220333:2388748") { | ||
| transitive = false | ||
| } | ||
| compileOnly("curse.maven:cofh-core-69162:2388751") { | ||
| transitive = false | ||
| } | ||
| compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:api") { | ||
| transitive = false | ||
| } | ||
| compileOnly('curse.maven:computercraft-67504:2269339') | ||
| compileOnly('curse.maven:cofh-lib-220333:2388748') | ||
| compileOnly('curse.maven:cofh-core-69162:2388751') | ||
| compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api') {transitive=false} | ||
| } |
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