Skip to content

Commit fae2f90

Browse files
authored
Merge pull request #377 from Wolfsblvt/develop
Merge for release v0.1.2
2 parents 8f5aa87 + 092dc64 commit fae2f90

File tree

85 files changed

+6655
-1974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+6655
-1974
lines changed

.classpath

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry excluding="main/resources/" kind="src" output="target/classes" path="src">
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
10-
<attributes>
11-
<attribute name="maven.pomderived" value="true"/>
12-
</attributes>
13-
</classpathentry>
9+
<classpathentry kind="src" path="src/main/resources"/>
10+
<classpathentry kind="src" path="test"/>
1411
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1512
<attributes>
1613
<attribute name="maven.pomderived" value="true"/>
1714
</attributes>
1815
</classpathentry>
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1917
<classpathentry kind="output" path="target/classes"/>
2018
</classpath>

.codeclimate.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Languages
2+
languages:
3+
Java: true
4+
5+
# Ignore files that are not relevant for the check
6+
exclude_paths:
7+
- out/
8+
- target/
9+
- "**/thirdparty/"
10+
- checkstyle.xml
11+
12+
# Enables useful engines
13+
engines:
14+
# Checks for left TODO marks
15+
fixme:
16+
enabled: true
17+
# Another Java code style checking. Testable
18+
pmd:
19+
enabled: true
20+
channel: "beta"
21+
# Java Code Style checking
22+
checkstyle:
23+
enabled: true
24+
channel: "beta"
25+
config: "checkstyle.xml"
26+
27+
ratings:
28+
paths:
29+
- "**.java"

.gitaliases

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
####################
1414
# Go to the branch with given name
1515
go = "checkout"
16+
# Gets the given remote branch locally and set to track it
17+
get = "checkout -t"
1618
# Go back to develop branch
1719
return = "checkout develop"
1820
# Removes the last commit
@@ -34,7 +36,7 @@
3436
# Recreates current branch based on develop
3537
recreate = !"f() { git create-with-delete $(git branch-name); }; f"
3638
# Remove all branches that got already merged
37-
tidy = !"git return && git refresh && git fetch --all -p && git branch -vv | grep ': gone]' | awk '{ print $1 }' | xargs -n 1 git branch -d"
39+
tidy = !"git return && git refresh && git fetch --all -p && git branch -vv | grep ': gone]' | awk '{ print $1 }' | xargs -n 1 git branch -D"
3840

3941
###########
4042
# Helpers #

.idea/artifacts/BlossomsPogoManager_jar.xml

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyleSettings.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)