|
|
e95822ab94
|
Merge pull request #1 from TBMCPlugins/iie
Merge iie's code into NorbiPeti's code
|
2016-11-05 21:57:36 +01:00 |
|
|
|
0c72166509
|
Committing correct version of conflciting files
|
2016-11-05 21:57:06 +01:00 |
|
|
|
88a24251f9
|
Converted pom.xml...
|
2016-11-05 21:49:27 +01:00 |
|
|
|
c1a7aa8732
|
Made progress on merge conflict
|
2016-11-05 21:47:21 +01:00 |
|
|
|
ae11acc4bf
|
Renamed things here as well to fix conflicts
|
2016-11-05 20:51:18 +01:00 |
|
|
|
ef7d2bf12f
|
Renamed things here as well to fix conflicts
|
2016-11-05 20:51:02 +01:00 |
|
BuildTools
|
6ceb5e1210
|
next have to do playerdata serializing
not sure if there’s stuff i was in the middle of changing, there might
be weird shit anomalies or there
|
2016-11-05 15:00:29 -04:00 |
|
|
|
28e3aa721f
|
Changed in plugin.yml as well
|
2016-11-02 23:57:20 +01:00 |
|
|
|
eaa9f7f79e
|
Renamed packages
|
2016-11-02 23:53:22 +01:00 |
|
|
|
520e54d823
|
Renamed packages
|
2016-11-02 23:53:05 +01:00 |
|
|
|
131c489ccd
|
Added exception handler
|
2016-11-02 23:51:19 +01:00 |
|
|
|
777e723105
|
Converted to Maven project
|
2016-11-02 23:38:17 +01:00 |
|
BuildTools
|
a664e33963
|
removed some dead weight
|
2016-10-29 03:39:20 -04:00 |
|
BuildTools
|
db74430384
|
reorganized code, added world share settings
|
2016-10-29 03:02:27 -04:00 |
|
BuildTools
|
9184da925b
|
added SerializerDebug.java
|
2016-10-26 13:58:42 -04:00 |
|
BuildTools
|
8bc9cbb7c2
|
new Serializer class uses only NMS
|
2016-10-25 23:33:45 -04:00 |
|
BuildTools
|
4d945b9193
|
New Commit
hopefully nothing gets fucked up
|
2016-10-07 13:19:38 -04:00 |
|
BuildTools
|
3a007c5ec9
|
first commit
|
2016-09-07 00:08:33 -04:00 |
|
BuildTools
|
20861eb67b
|
testcommit
|
2016-08-31 18:41:49 -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 |
|
