Commit graph

42 commits

Author SHA1 Message Date
alisolarflare
466fba48c8 Add 'Hardcore/' from commit '1b166ae455e62e8358d2032cb2dc24ca86b60ce8'
git-subtree-dir: Hardcore
git-subtree-mainline: f3211ef858
git-subtree-split: 1b166ae455
2017-02-16 17:48:54 -05:00
alisolarflare
f3211ef858 Add 'ButtonPluginLaboratory/' from commit 'b398fe0e33bda6a48ff183cd9a2895df2e952b79'
git-subtree-dir: ButtonPluginLaboratory
git-subtree-mainline: d750852436
git-subtree-split: b398fe0e33
2017-02-16 17:45:22 -05:00
alisolarflare
d750852436 Initial commit 2017-02-16 17:27:55 -05:00
iie
1b166ae455 Committing conflicting changes 2016-09-16 21:29:03 +02: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
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
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
AliLaptop
b398fe0e33 Refactored Package and Class Names 2016-06-25 20:49:33 -04:00
alisolarflare
59b9ca454f Merge pull request #6 from TBMCPlugins/AliBranch
IIE War System and Discord Plugin Initialization
2016-06-24 20:34:13 -04:00
AliLaptop
f2c7100263 IIE War System and Discord Plugin Initialization 2016-06-24 20:34:01 -04:00
08f8d4f1d8 Removed ignored files 2016-06-24 14:33:16 +02:00
fda428b6d2 Added Gitignore 2016-06-24 14:30:20 +02:00
alisolarflare
ca304f708a Merge pull request #2 from TBMCPlugins/AliBranch
Gave Ali a custom arrow trail
2016-06-24 05:00:48 -04:00
AliLaptop
c6489cfeb2 Gave Ali a Green Arrow Trail
Made to test user permissions for future use, (also for a little fun :D)
2016-06-24 04:59:52 -04:00
alisolarflare
b89fff1ad1 Merge pull request #1 from alisolarflare/AliBranch
Plugin Initialization
2016-06-23 14:08:51 -04:00
AliLaptop
dc96c383a9 Plugin Initialization 2016-06-23 14:08:25 -04:00
alisolarflare
a0adf1f938 Initial commit 2016-06-23 13:41:53 -04:00