From 22f76a72614e649844863c46fe28d573f88f4a9c Mon Sep 17 00:00:00 2001 From: Taylor Shuler Date: Sun, 3 Aug 2014 20:34:00 +0100 Subject: [PATCH] Updated Git config files --- .gitattributes | 11 +++++++++++ .gitignore | 30 ++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..19fa4f2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +# Set default behaviour, in case users don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files we want to always be normalized and converted to native line endings on checkout. +*.md text +*.info text +*.txt text + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary diff --git a/.gitignore b/.gitignore index 8eef75c..fb705af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,28 @@ -build/ -.classpath -.project -.gradle/ -eclipse/ +gnore Gradle cache files & directories bin/ +build/ + +## Exclusive to IronChests repo/ -/run/ +run/ + +## Forge +forge-*.txt + +## Eclipse +eclipse/ +.classpath +.gradle/ +.project .settings/ -#IDEA files from Gradle -.idea/ + +## Idea +.idea /*.iml /*.ipr /*.iws + +# Ignore OS cache files & directories +*.DS_Store +_MACOSX +Thumbs.db