diff --git a/.gitignore b/.gitignore index c43f869..1131f94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,29 @@ -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + .DS_Store .AppleDouble .LSOverride # Icon must ends with two \r. -Icon +Icon + # Thumbnails ._* @@ -30,51 +31,62 @@ Icon # Files that might appear on external disk .Spotlight-V100 .Trashes - -# Windows -# ========================= - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -###################### -# Eclipse -###################### -*.pydevproject -.project -.metadata -.gradle/ -bin/ -build/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath -/src/main/resources/rebel.xml -# External tool builders -.externalToolBuilders/ -# Locally stored "Eclipse launch configurations" -*.launch -# CDT-specific -.cproject -# PDT-specific -.buildpath + +# Windows +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +###################### +# Eclipse +###################### +*.pydevproject +.project +.metadata +.gradle/ +bin/ +build/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath +/src/main/resources/rebel.xml +# External tool builders +.externalToolBuilders/ +# Locally stored "Eclipse launch configurations" +*.launch +# CDT-specific +.cproject +# PDT-specific +.buildpath /run/ /logs/ +eclipse/ + +################### +# IntelliJ IDEA +################### +.idea/ +*.iml +*.iws + +# Minecraft Forge files +*.txt diff --git a/build.gradle b/build.gradle index bfb1d18..5e99801 100644 --- a/build.gradle +++ b/build.gradle @@ -18,11 +18,11 @@ buildscript { apply plugin: 'forge' version = "1.0" -group= "com.maxpowa" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group= "com.maxpowa.advancedhud" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "advancedhud" minecraft { - version = "1.7.10-10.13.0.1180" + version = "1.7.10-10.13.2.1230" assetDir = "eclipse/assets" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 667288a..b761216 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 55f4524..1fd1e7c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 29 18:00:54 CDT 2013 +#Sun Jan 11 08:50:06 EST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755