Skip to content

Commit 7902bdc

Browse files
RadBuilderRadBuilder
committed
Merge remote-tracking branch 'refs/remotes/iSach/development' into development
2 parents 88d766f + 3377122 commit 7902bdc

62 files changed

Lines changed: 198 additions & 9288 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,16 @@
1-
<<<<<<< HEAD
2-
# UltraCosmetics
3-
UltraCosmetics is a Spigot 1.8.8/1.9.x/1.10 plugin which adds cool cosmetics for your server hub.
4-
5-
You must use Spigot, and not CraftBukkit for this plugin!
6-
7-
THE (“UltraCosmetics”) SOURCE IS PROVIDED AS IS AT NO MONETARY COST FOR PERSONAL USE ONLY. ANY COMMERCIAL DISTRIBUTION/USE OF THE (“UltraCosmetics”) SOURCE IS STRICTLY PROHIBITED.
8-
9-
Adding a new Cosmetics is really simple.
10-
Create your GadgetType, PetType, etc.. In the enum file located in the corresponding cosmetic package.
11-
12-
Create the file extending Gadget/Pet/etc... and make your gadget. (you can have a look to other gadgets if you don't
13-
know how to do)
14-
15-
Done! :)
16-
17-
Nightly Builds: http://ci.isach.be/job/UltraCosmetics/
18-
=======
191
# UltraCosmetics
20-
UltraCosmetics is a Spigot (not Bukkit/CraftBukkit) plugin for Minecraft 1.8.8+ that adds cool cosmetics to your server.
2+
UltraCosmetics is a Spigot 1.8.8/1.9.x/1.10 plugin which adds cool cosmetics for your server hub.
3+
4+
You must use Spigot, and not CraftBukkit for this plugin!
215

226
THE (“UltraCosmetics”) SOURCE IS PROVIDED AS IS AT NO MONETARY COST FOR PERSONAL USE ONLY. ANY COMMERCIAL DISTRIBUTION/USE OF THE (“UltraCosmetics”) SOURCE IS STRICTLY PROHIBITED.
237

24-
Looking for support? Check out [the wiki](https://github.com/iSach/UltraCosmetics/wiki) or join the Discord!
8+
Adding a new Cosmetics is really simple.
9+
Create your GadgetType, PetType, etc.. In the enum file located in the corresponding cosmetic package.
2510

26-
Adding a new cosmetic is really simple.
27-
1. Create your GadgetType, PetType, etc. in the enum file located in the corresponding cosmetic package.
28-
2. Have the file extend Gadget/Pet/etc...
29-
3. Make your gadget!
30-
*(Take a look to other gadgets if you don't know how or need help)*
11+
Create the file extending Gadget/Pet/etc... and make your gadget. (you can have a look to other gadgets if you don't
12+
know how to do)
3113

32-
Enjoy!
14+
Done! :)
3315

34-
Builds: http://ci.isach.be/job/UltraCosmetics/
35-
>>>>>>> refs/remotes/origin/master
16+
Nightly Builds: http://ci.isach.be/job/UltraCosmetics/

‎build.gradle‎

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '3.0.0-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } }}boolean local = falseif (local) libsDirName = '/Users/Sacha/Documents/Development/Java/UltraCosmetics/testserver/plugins'dependencies { subprojects.each { p -> shaded(p) { transitive false } }}subprojects { repositories { flatDir { dirs '/Users/Sacha/Documents/Development/Java/UltraCosmetics/testserver' } mavenCentral() maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } maven { url 'http://repo.md-5.net/content/groups/public/' } }}
4-
=======
5-
allprojects {
6-
apply plugin: 'java'
7-
apply plugin: 'eclipse'
8-
apply plugin: 'idea'
9-
10-
group = 'be.isach'
11-
version = '3.0.0-RELEASE'
12-
13-
compileJava.options.encoding = 'UTF-8'
14-
15-
sourceCompatibility = 1.8
16-
targetCompatibility = 1.8
17-
18-
configurations {
19-
shaded
20-
compile.extendsFrom shaded
21-
}
22-
23-
afterEvaluate {
24-
jar {
25-
dependsOn configurations.shaded
26-
from configurations.shaded.collect {
27-
it.isDirectory() ?
28-
it :
29-
zipTree(it)
30-
}
31-
}
32-
}
33-
}
34-
35-
boolean local = true
36-
37-
if (local) libsDirName = 'C:\\Users\\RadBu\\GitHub Workspace\\'
38-
39-
dependencies {
40-
subprojects.each { p ->
41-
shaded(p) {
42-
transitive false
43-
}
44-
}
45-
}
46-
47-
subprojects {
48-
repositories {
49-
flatDir {
50-
dirs 'C:\\Users\\RadBu\\Documents\\BuildTools'
51-
}
52-
mavenCentral()
53-
maven {
54-
url 'http://nexus.hc.to/content/repositories/pub_releases'
55-
}
56-
maven {
57-
url 'http://repo.md-5.net/content/groups/public/'
58-
}
59-
}
60-
}
61-
>>>>>>> refs/remotes/origin/master
62-
=======
63-
allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '3.0.0-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } }}boolean local = falseif (local) libsDirName = '/Users/Sacha/Documents/Development/Java/UltraCosmetics/testserver/plugins'dependencies { subprojects.each { p -> shaded(p) { transitive false } }}subprojects { repositories { mavenCentral() // Vault maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } // Lib's Disguises maven { url 'http://repo.md-5.net/content/groups/public/' } // Spigot maven { url 'https://repo.isach.be' } // BungeeCord maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } }}
64-
>>>>>>> refs/remotes/iSach/development
1+
allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '3.0.0-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } }}boolean local = falseif (local) libsDirName = '/Users/Sacha/Documents/Development/Java/UltraCosmetics/testserver/plugins'dependencies { subprojects.each { p -> shaded(p) { transitive false } }}subprojects { repositories { mavenCentral() // Vault maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } // Lib's Disguises maven { url 'http://repo.md-5.net/content/groups/public/' } // Spigot maven { url 'https://repo.isach.be' } // BungeeCord maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } }}

‎core/build.gradle‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
1-
<<<<<<< HEAD
2-
dependencies {
3-
compile 'org.spigotmc:spigot:1.11'
4-
compile ('LibsDisguises:LibsDisguises:9.0.7') {
5-
exclude group: 'org.spigotmc'
6-
exclude group: 'com.comphenix.protocol'
7-
}
8-
compile('net.milkbowl.vault:VaultAPI:1.6') {
9-
exclude group: 'org.bukkit'
10-
}
11-
}
12-
13-
processResources {
14-
inputs.property("version", project.version)
15-
16-
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
17-
'VERSION': project.version.split('-')[0]
18-
]
19-
=======
201
dependencies {
21-
compile name: 'spigot-1.11.2'
22-
compile ('LibsDisguises:LibsDisguises:9.2.4') {
2+
compile 'org.spigotmc:spigot:1.11'
3+
compile ('LibsDisguises:LibsDisguises:9.0.7') {
234
exclude group: 'org.spigotmc'
245
exclude group: 'com.comphenix.protocol'
256
}
@@ -34,5 +15,4 @@ processResources {
3415
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
3516
'VERSION': project.version.split('-')[0]
3617
]
37-
>>>>>>> refs/remotes/origin/master
3818
}

0 commit comments

Comments
 (0)