alisolarflare
|
11ba47ac41
|
Add 'unconflicted-Hardcore/' from commit '75c7b605b4d4115c1f765219abfa490593f9fb19'
git-subtree-dir: unconflicted-Hardcore
git-subtree-mainline: 466fba48c8
git-subtree-split: 75c7b605b4
|
2017-02-16 17:49:34 -05:00 |
|
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 |
|
|
|
75c7b605b4
|
Fixed plugin.yml inclusion
|
2016-10-23 12:44:39 +02:00 |
|
BuildTools
|
9a2787b8c5
|
divide zAverage by 2
|
2016-10-23 00:19:30 -04:00 |
|
alisolarflare
|
b6a8bc709b
|
Merge pull request #5 from TBMCPlugins/Ali
Changed HelloWorldPlugin to ButtonHardcorePlugin
|
2016-10-23 00:13:46 -04:00 |
|
alisolarflare
|
4bdb9603a0
|
Changed HelloWorldPlugin to ButtonHardcorePlugin
|
2016-10-23 00:13:21 -04:00 |
|
alisolarflare
|
de4c5c8dbc
|
Merge pull request #4 from TBMCPlugins/Ali
Ali
|
2016-10-22 22:09:50 -04:00 |
|
alisolarflare
|
b17822976e
|
Removed a deadly listener
|
2016-10-22 22:09:20 -04:00 |
|
alisolarflare
|
c1bd614935
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Ali
|
2016-10-22 21:14:30 -04:00 |
|
BuildTools
|
e86754efcb
|
removing commented-out for loop
|
2016-10-22 21:10:26 -04:00 |
|
alisolarflare
|
f09d00fd1a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Ali
|
2016-10-22 21:06:28 -04:00 |
|
BuildTools
|
740ac21fec
|
test
|
2016-10-22 21:03:38 -04:00 |
|
BuildTools
|
1e17a1dab6
|
picking a random direction without a loop
|
2016-10-22 20:51:34 -04:00 |
|
alisolarflare
|
b51468a840
|
Merge pull request #3 from TBMCPlugins/Ali
Adjusted RandomTP to be static
|
2016-10-22 20:36:22 -04:00 |
|
alisolarflare
|
4c812b5129
|
Adjusted RandomTP to be static
|
2016-10-22 20:35:57 -04:00 |
|
BuildTools
|
8624563a2b
|
very minor reformatting of mainplugin
|
2016-10-22 20:08:46 -04:00 |
|
alisolarflare
|
1897c1361b
|
Merge pull request #2 from TBMCPlugins/Ali
Added more listeners, changed name
|
2016-10-22 19:27:20 -04:00 |
|
alisolarflare
|
6dab69e2c9
|
Added more listeners, changed name
|
2016-10-22 19:26:51 -04:00 |
|
iiegit
|
e50e49bbff
|
Merge pull request #1 from TBMCPlugins/Ali
added DebugRTP
|
2016-10-22 19:16:24 -04:00 |
|
alisolarflare
|
034391d0c8
|
added DebugRTP
|
2016-10-22 19:14:08 -04:00 |
|
BuildTools
|
137f394830
|
My current build
|
2016-10-11 16:48:51 -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 |
|
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 |
|
