forked from D-Cysteine/nei-custom-diagram
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Merge in v1.4.8 from upstream * Add nanites to GregTech Material Parts diagram * Add another row for tools in GregTech Material Tools diagram * Update buildscript * Apply spotless * Add missing runtime dep * Try updating dependencies * Update dependencies * Add more missing runtime dependencies * Try sorting and organizing things a bit * Update GT++ version * Update Bartworks version * Add another missing runtime dep * Update dependencies.gradle * Disable GT++ in runtime again * Update repositories.gradle * derp * Try adding Galacticraft to runtime deps * Nope, try GoodGenerator instead * Try adding TecTech too * Fix dep versions * duct tape * Add repository for fernflower? * Remove unneeded repo and probably don't need TecTech * Update build-and-test.yml * Try GT++ in runtime again. Bump time to 180s Co-authored-by: Martin Robertz <dream-master@gmx.net>
- Loading branch information
1 parent
41aba3f
commit d460ab1
Showing
103 changed files
with
2,717 additions
and
3,104 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,44 @@ | ||
| * text eol=lf | ||
|
|
||
| *.[jJ][aA][rR] binary | ||
|
|
||
| *.[pP][nN][gG] binary | ||
| *.[jJ][pP][gG] binary | ||
| *.[jJ][pP][eE][gG] binary | ||
| *.[gG][iI][fF] binary | ||
| *.[tT][iI][fF] binary | ||
| *.[tT][iI][fF][fF] binary | ||
| *.[iI][cC][oO] binary | ||
| *.[sS][vV][gG] text | ||
| *.[eE][pP][sS] binary | ||
| *.[xX][cC][fF] binary | ||
|
|
||
| *.[kK][aA][rR] binary | ||
| *.[mM]4[aA] binary | ||
| *.[mM][iI][dD] binary | ||
| *.[mM][iI][dD][iI] binary | ||
| *.[mM][pP]3 binary | ||
| *.[oO][gG][gG] binary | ||
| *.[rR][aA] binary | ||
|
|
||
| *.7[zZ] binary | ||
| *.[gG][zZ] binary | ||
| *.[tT][aA][rR] binary | ||
| *.[tT][gG][zZ] binary | ||
| *.[zZ][iI][pP] binary | ||
|
|
||
| *.[tT][cC][nN] binary | ||
| *.[sS][oO] binary | ||
| *.[dD][lL][lL] binary | ||
| *.[dD][yY][lL][iI][bB] binary | ||
| *.[pP][sS][dD] binary | ||
| *.[tT][tT][fF] binary | ||
| *.[oO][tT][fF] binary | ||
|
|
||
| *.[pP][aA][tT][cC][hH] -text | ||
|
|
||
| *.[bB][aA][tT] text eol=crlf | ||
| *.[cC][mM][dD] text eol=crlf | ||
| *.[pP][sS]1 text eol=crlf | ||
|
|
||
| *[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary |
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
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,30 +1,38 @@ | ||
| // Add your dependencies here | ||
|
|
||
| dependencies { | ||
| compile('com.github.GTNewHorizons:NotEnoughItems:2.3.6-GTNH:dev') | ||
| compileOnly('com.google.auto.value:auto-value-annotations:1.8.2') | ||
| annotationProcessor('com.google.auto.value:auto-value:1.8.2') | ||
|
|
||
| compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev') | ||
|
|
||
| compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.79:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.49:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:bartworks:0.5.84:dev') {transitive=false} | ||
| compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.27:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:EnderStorage:1.4.12:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:DetravScannerMod:1.6.9:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:ForestryMC:4.4.14:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:Railcraft:9.13.10:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:EnderIO:2.3.1.44:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:BuildCraft:7.1.27:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:EnderStorage:1.4.12:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.214:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:GTplusplus:1.7.190:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.127:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:bartworks:0.5.138:dev') {transitive=false} | ||
|
|
||
| // Compile-time dependencies of GT5 | ||
| compile('com.github.GTNewHorizons:BuildCraft:7.1.28:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:EnderIO:2.3.1.49:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:ForestryMC:4.5.6:api') {transitive=false} | ||
| compile('com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev') {transitive=false} | ||
| compile('com.github.GTNewHorizons:Railcraft:9.13.14:api') {transitive=false} | ||
|
|
||
| compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') | ||
| runtime("curse.maven:cofh-core-69162:2388751") | ||
| runtime('curse.maven:advsolar-362768:2885953') | ||
|
|
||
| runtime('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') | ||
| runtime('com.github.GTNewHorizons:Yamcl:0.5.84:dev') | ||
| runtime('com.github.GTNewHorizons:Chisel:2.10.16-GTNH:dev') | ||
| runtime('com.github.GTNewHorizons:ForgeMultipart:1.3.0:dev') | ||
| runtime('com.github.GTNewHorizons:ForgeRelocation:0.0.3:dev') | ||
| runtime('com.github.GTNewHorizons:GTNHLib:0.0.8.1:dev') | ||
| runtime('com.github.GTNewHorizons:GoodGenerator:0.4.76:dev') | ||
| runtime('com.github.GTNewHorizons:ModularUI:1.0.43:dev') | ||
| runtime('com.github.GTNewHorizons:MrTJPCore:1.1.1:dev') | ||
| runtime('com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev') | ||
| runtime('com.github.GTNewHorizons:GTNHLib:0.0.5:dev') | ||
| runtime('com.github.GTNewHorizons:Chisel:2.10.10-GTNH:dev') | ||
| runtime('com.github.GTNewHorizons:Yamcl:0.5.84:dev') | ||
| runtime('com.github.GTNewHorizons:waila:1.5.22:dev') | ||
|
|
||
| compileOnly('com.google.auto.value:auto-value-annotations:1.8.2') {transitive=false} | ||
| annotationProcessor('com.google.auto.value:auto-value:1.8.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| plugins { | ||
| id 'com.diffplug.blowdryerSetup' version '1.6.0' | ||
| } | ||
|
|
||
| apply plugin: 'com.diffplug.blowdryerSetup' | ||
|
|
||
| blowdryerSetup { | ||
| github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5') | ||
| //devLocal '.' // Use this when testing config updates locally | ||
| } |
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 |
|---|---|---|
|
|
@@ -2,5 +2,6 @@ | |
|
|
||
| public interface DiagramGenerator { | ||
| DiagramGroupInfo info(); | ||
|
|
||
| DiagramGroup generate(); | ||
| } | ||
Oops, something went wrong.