Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First pull request #217

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

First pull request #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ad626f
First push
TEKAA92 Feb 3, 2015
7e9a5f4
Changed plugin.yml
TEKAA92 Feb 3, 2015
e1fea9b
GitHub recommended reindentations
TEKAA92 Feb 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Programmering/spigot_server.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Testserver/plugins/Vault.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Testserver/plugins/bPermissions.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Programmering/mockito-all-1.9.5.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Programmering/EssentialsGroupManager.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Programmering/powermock-mockito-junit-1.6.1/powermock-mockito-1.6.1-full.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Programmering/zPermissions-1.3beta1.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Testserver/plugins/PermissionsEx.jar"/>
<classpathentry kind="lib" path="C:/Users/Thomas/Desktop/Programmering/PermissionsBukkit-2.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
17 changes: 17 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
53 changes: 27 additions & 26 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
# NetBeans specific #
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml

# Class Files #
*.class

# Package Files #
*.jar
*.war
*.ear
/nbproject/genfiles.properties
/nbproject/build-impl.xml
*.log
*.aux
/coverage
/output
*\.txt~
*\.tex~
*\.yml~
*.synctex.gz
# NetBeans specific #
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml

# Class Files #
*.class

# Package Files #
*.jar
*.war
*.ear
/nbproject/genfiles.properties
/nbproject/build-impl.xml
*.log
*.aux
/coverage
/output
*\.txt~
*\.tex~
*\.yml~
*.synctex.gz
/bin
17 changes: 17 additions & 0 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>CommunityBridge</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
6 changes: 3 additions & 3 deletions build.number
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Fri Aug 22 05:46:37 CDT 2014
build.number=563
#Build Number for ANT. Do not edit!
#Fri Aug 22 05:46:37 CDT 2014
build.number=563
48 changes: 24 additions & 24 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="CommunityBridge" default="default" basedir=".">
<description>Builds, tests, and runs the project CommunityBridge.</description>
<import file="nbproject/build-impl.xml"/>
<target name="-pre-compile">
<!-- Increment the build number -->
<buildnumber file="build.number"/>
<!-- Update the build number in the plugin.yml file -->
<replaceregexp byline="false">
<regexp pattern="version: (\d*\.\d*\.\d*)\.\d*"/>
<substitution expression="version: \1.${build.number}"/>
<fileset dir="src/">
<include name="plugin.yml"/>
</fileset>
</replaceregexp>
</target>
<target name="-post-jar">
<!-- Copy the jar file into the test server plugin folder -->
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\CraftBukkitA\plugins" />
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\CraftBukkitB\plugins" />
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\SpigotA\plugins" />
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\SpigotB\plugins" />
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project name="CommunityBridge" default="default" basedir=".">
<description>Builds, tests, and runs the project CommunityBridge.</description>
<import file="nbproject/build-impl.xml"/>
<target name="-pre-compile">
<!-- Increment the build number -->
<buildnumber file="build.number"/>
<!-- Update the build number in the plugin.yml file -->
<replaceregexp byline="false">
<regexp pattern="version: (\d*\.\d*\.\d*)\.\d*"/>
<substitution expression="version: \1.${build.number}"/>
<fileset dir="src/">
<include name="plugin.yml"/>
</fileset>
</replaceregexp>
</target>
<target name="-post-jar">
<!-- Copy the jar file into the test server plugin folder -->
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\CraftBukkitA\plugins" />
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\CraftBukkitB\plugins" />
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\SpigotA\plugins" />
<copy file="${dist.jar}" flatten="true" todir="..\..\TestServers\SpigotB\plugins" />
</target>
</project>
4 changes: 2 additions & 2 deletions communitybridge.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
Manifest-Version: 1.0

114 changes: 57 additions & 57 deletions documentation/developer/communitybridgedeveloperdocumentation.kilepr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
[General]
bibliographyBackendAutoDetected=
bibliographyBackendUserOverride=
def_graphic_ext=eps
img_extIsRegExp=false
img_extensions=.eps .jpg .jpeg .png .pdf .ps .fig .gif
kile_livePreviewEnabled=true
kile_livePreviewStatusUserSpecified=false
kile_livePreviewTool=LivePreview-PDFLaTeX
kileprversion=2
kileversion=2.9.60
lastDocument=developer documentation.tex
masterDocument=
name=CommunityBridge Developer Documentation
pkg_extIsRegExp=false
pkg_extensions=.cls .sty .bbx .cbx .lbx
src_extIsRegExp=false
src_extensions=.tex .ltx .latex .dtx .ins
[Tools]
MakeIndex=
QuickBuild=
[document-settings,item:developer documentation.tex]
Bookmarks=
Encoding=UTF-8
FoldedColumns=
FoldedLines=
Highlighting=LaTeX
Indentation Mode=normal
Mode=LaTeX
[item:communitybridgedeveloperdocumentation.kilepr]
archive=true
column=1
encoding=
highlight=
line=0
mode=
open=false
order=-1
[item:developer documentation.tex]
archive=true
column=15
encoding=UTF-8
highlight=LaTeX
line=138
mode=LaTeX
open=true
order=0
[view-settings,view=0,item:developer documentation.tex]
CursorColumn=15
CursorLine=138
JumpList=
ViMarks=
[General]
bibliographyBackendAutoDetected=
bibliographyBackendUserOverride=
def_graphic_ext=eps
img_extIsRegExp=false
img_extensions=.eps .jpg .jpeg .png .pdf .ps .fig .gif
kile_livePreviewEnabled=true
kile_livePreviewStatusUserSpecified=false
kile_livePreviewTool=LivePreview-PDFLaTeX
kileprversion=2
kileversion=2.9.60
lastDocument=developer documentation.tex
masterDocument=
name=CommunityBridge Developer Documentation
pkg_extIsRegExp=false
pkg_extensions=.cls .sty .bbx .cbx .lbx
src_extIsRegExp=false
src_extensions=.tex .ltx .latex .dtx .ins

[Tools]
MakeIndex=
QuickBuild=

[document-settings,item:developer documentation.tex]
Bookmarks=
Encoding=UTF-8
FoldedColumns=
FoldedLines=
Highlighting=LaTeX
Indentation Mode=normal
Mode=LaTeX

[item:communitybridgedeveloperdocumentation.kilepr]
archive=true
column=1
encoding=
highlight=
line=0
mode=
open=false
order=-1

[item:developer documentation.tex]
archive=true
column=15
encoding=UTF-8
highlight=LaTeX
line=138
mode=LaTeX
open=true
order=0

[view-settings,view=0,item:developer documentation.tex]
CursorColumn=15
CursorLine=138
JumpList=
ViMarks=
6 changes: 3 additions & 3 deletions manifest.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build

12 changes: 6 additions & 6 deletions nbproject/coverage.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#coverage viewer module properties for project
#Fri Aug 01 21:36:09 CDT 2014
coverage.activity=OFF
project.type=java
coverage.coverageFile=coverage/coverage.emma
coverage.templateFile=coverage/template.emma
#coverage viewer module properties for project
#Fri Aug 01 21:36:09 CDT 2014
coverage.activity=OFF
project.type=java
coverage.coverageFile=coverage/coverage.emma
coverage.templateFile=coverage/template.emma
Loading