git stuff

This commit is contained in:
KryptonCaptain committed 2018-08-08 11:31:14 +10:00
1 parent 918334e5bf
commit bff3c669bf
3 files changed
+116 -41

No files matched your search

+103 -28
View File
@@ -1,28 +1,103 @@
# IntelliJ IDEA Files
*.iml
*.ipr
*.iws
out/
.idea/
# Eclipse Project Files
.classpath
.project
.settings/
eclipse/
# Gradle
.gradle
gradle/
build/
debug/
bin/
config/
crash-reports/
logs/
mods/
saves/
usernamecache.json
options.txt
asm
Thumbs.db
# IntelliJ IDEA Files
*.iml
*.ipr
*.iws
out/
.idea/
# Eclipse Project Files
.classpath
.project
.settings/
eclipse/
# Gradle
.gradle
gradle/
build/
debug/
bin/
config/
crash-reports/
logs/
mods/
saves/
usernamecache.json
options.txt
asm
Thumbs.db
## Windows
Thumbs.db
## gradle
/.gradle
/build
## ForgeGradle
/run
## eclipse
/.settings
/.metadata
/.classpath
/.project
/eclipse
/bin
## intellij
/out
/.idea
/atlassian-ide-plugin.xml
/*.ipr
/*.iws
/*.iml
## Private Stuffs
/private.properties
## Jars
*.jar
!/gradle/wrapper/gradle-wrapper.jar
### OSX (adds a lot of garbage)###
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
# Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
*.bat
LICENSE*
forge*
CREDITS*
MinecraftForge*
README.txt
*.psd
*.pdn
/src/main/resources/assets/thaumcraft
##API
/src/api
/models
+2 -2
View File
@@ -52,8 +52,8 @@ dependencies {
compile "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:api"
runtime "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:dev"
//compile name: 'Botania', version: "${project.version_botania}", ext: 'jar'
compile name: 'Baubles', version: "${project.version_baubles}", ext: 'jar'
compile name: 'Thaumcraft', version: "${project.version_thaumcraft}", ext: 'jar'
//compile name: 'Baubles', version: "${project.version_baubles}", ext: 'jar'
//compile name: 'Thaumcraft', version: "${project.version_thaumcraft}", ext: 'jar'
}
processResources
+11 -11
View File
@@ -1,11 +1,11 @@
version_major=2
version_minor=4
version_rev=4
version_forestry=4.2.+
version_botania=r1.8-248
version_baubles=1.0.1.10
version_thaumcraft=4.2.3.5
version_mc=1.7.10
version_forge=10.13.4.1566-1.7.10
version_major=2
version_minor=5
version_rev=0
version_forestry=4.2.+
version_botania=r1.8-248
version_baubles=1.0.1.10
version_thaumcraft=4.2.3.5
version_mc=1.7.10
version_forge=10.13.4.1614-1.7.10