Commit graph

464 commits

Author SHA1 Message Date
alisolarflare
df96b4102b Finished Flairdoors for testing, added debug messages 2016-10-07 19:40:45 -04:00
alisolarflare
89d609a3b8 Added the FlairMe class 2016-10-07 19:23:13 -04:00
alisolarflare
09c5f6ffc1 Worked more on Flairdoors 2016-10-07 19:20:37 -04:00
fbf9e8ec4a Rephrased it to addYML files, not remove them 2016-10-07 22:15:10 +02:00
05d89b087a Told Maven to add YML files 2016-10-07 22:13:00 +02:00
de2106abc1 Added dependency for StringUtils 2016-10-06 19:06:34 +02:00
j0ach1mmall3
54ef291398 Remove unneccessary final 2016-09-28 13:00:20 +02:00
Trent Hensler
862099b76b Merge pull request #86 from vemacs/patch-2
Grammar fixes
2016-09-27 11:04:53 -07:00
Blinky™
e30ab286b6 Grammar fixes
It's Hacktoberfest again
2016-09-27 12:02:02 -05:00
66e704e103 Delete .classpath 2016-09-17 23:48:08 +02:00
alisolarflare
8b13b1b2c1 NORBI PLS 2016-09-17 17:43:58 -04:00
alisolarflare
51f5d8ba86 Added a toon of tags 2016-09-17 17:23:53 -04:00
alisolarflare
f2a567680c Added Tags 2016-09-17 16:59:37 -04:00
alisolarflare
38007dae2d Added pom.xml 2016-09-17 16:51:06 -04:00
iie
1b166ae455 Committing conflicting changes 2016-09-16 21:29:03 +02:00
BuildTools
f1034a986f Cloning things in 2016-09-12 00:05:07 -04:00
iiegit
7a4107d790 Initial commit 2016-09-11 23:58:32 -04:00
alisolarflare
0dd474ce86 edited stuff 2016-09-04 23:08:57 -04:00
alisolarflare
59d8dc791c Try to merge my commit, past the conflicts 2016-09-04 21:52:27 -04:00
BuildTools
7c82d7879a changed command to "hardcore"
removed debug messages, removed usage of hashmap to rely entirely on
scoreboard,
2016-09-04 21:33:58 -04:00
BuildTools
134b395ac8 testcommit 2016-09-04 21:33:58 -04:00
alisolarflare
d060bd118a Revert "Finalized the RandomTP"
This reverts commit fb43e3c8d7.
2016-09-04 21:29:59 -04:00
alisolarflare
fb43e3c8d7 Finalized the RandomTP 2016-09-04 21:22:17 -04:00
alisolarflare
b9c0c59371 Turned Links into pure Strings 2016-09-02 20:22:34 -04:00
BuildTools
172c1224f8 Alright let's see what happens with this conflicting commit
# Conflicts:
#	src/iie/DeathListener.java
#	src/iie/HelloWorldPlugin.java
2016-08-31 14:14:05 -04:00
BuildTools
5eed40ddb6 More fixes 2016-08-31 13:59:31 -04:00
alisolarflare
f9b4d9abe4 Created a Conflict Compass Crafting listener 2016-08-31 08:33:45 -04:00
alisolarflare
6932fa56dd Changed Listeners to return boolean values 2016-08-31 08:10:15 -04:00
alisolarflare
2b4ba7f8eb Finished ConflictRTP code 2016-08-31 08:06:02 -04:00
alisolarflare
7bb679042a Merge pull request #2 from NorbiPeti/master
Fix crash at plugin load

*seems legit*
2016-08-31 06:48:28 -04:00
alisolarflare
1a66291958 Started work on ConflictRTP 2016-08-31 02:36:49 -04:00
e30e60da28 Fix crash at plugin load 2016-08-30 18:17:37 +02:00
BuildTools
a566c95087 Crash-proofing using scoreboard 2016-08-29 19:28:14 -04:00
alisolarflare
c4eb6565f1 removed classpath (.gitignore error) 2016-08-27 02:24:55 -04:00
alisolarflare
25569a7113 Created a diamond armor blocker 2016-08-27 02:24:27 -04:00
alisolarflare
e9cb4ef576 Added a diamond armor blocker 2016-08-27 01:40:54 -04:00
alisolarflare
e12cb68799 Created an RTP method 2016-08-27 01:40:54 -04:00
BuildTools
090430c864 let's test 2016-08-25 18:41:59 -04:00
alisolarflare
7d0847924b added .classpath to gitignore 2016-08-25 18:19:47 -04:00
BuildTools
786b806dae some fixes for DeathListener
to (this) or not to (this)
2016-08-25 18:07:42 -04:00
alisolarflare
1053249962 Fixed bullshit.
Made an error with the type of listener
2016-08-25 03:47:18 -04:00
alisolarflare
bcd18f7d39 Added a portal Listener class 2016-08-25 01:21:19 -04:00
alisolarflare
9073a6b220 Added sender.sendmessages 2016-08-23 23:39:53 -04:00
BuildTools
42fd476ff7 some more small changes 2016-08-23 23:21:20 -04:00
BuildTools
7651b14c93 some bugs fixed
DeathListener still not working
2016-08-23 22:55:58 -04:00
alisolarflare
3b2be4a9b3 added .project file 2016-08-23 15:44:02 -04:00
BuildTools
1ec94c06e8 human beings are pitiful clumps of matter 2016-08-23 14:25:31 -04:00
iiegit
23bed03961 Initial commit 2016-08-23 14:21:40 -04:00
alisolarflare
828a57a21f Started work on FlairDoors 2016-08-21 21:11:02 -04:00
alisolarflare
79a18d02dd Made AliLinks save, added Jar file 2016-08-21 14:27:04 -04:00