2847 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
manuelgu	8d6565c32c	Fix NPE	2016-05-29 19:38:31 +02:00
manuelgu	def33bc9ad	Fix IntellectualSites/PlotSquared#1140	2016-05-29 11:59:16 +02:00
MattBDev	53e4b728a6	Merge remote-tracking branch 'origin/master'	2016-05-28 22:38:10 -04:00
MattBDev	4af846967c	Fix #958	2016-05-28 22:37:56 -04:00
manuelgu	9ae4f02205	Fix forcefield flag	2016-05-28 01:16:01 +02:00
Jesse Boyd	85055320c2	Merge pull request #1134 from manuelgu/feature/componentevent ... [WIP] Implement PlotComponentSetEvent	2016-05-28 09:13:04 +10:00
manuelgu	d7b2881778	Don't * import	2016-05-28 01:12:05 +02:00
manuelgu	a7c965c6b0	Merge branch 'feature/componentevent' of https://github.com/manuelgu/PlotSquared into feature/componentevent	2016-05-28 01:09:25 +02:00
manuelgu	ec4839ec3f	Move event calling to Plot class	2016-05-28 01:09:13 +02:00
Jesse Boyd	b5cc6eeb0c	Merge remote-tracking branch 'origin/master' ... # Conflicts: # Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java	2016-05-28 08:45:35 +10:00
manuelgu	4078f0708b	Proper javadoc for event	2016-05-28 00:29:27 +02:00
Jesse Boyd	28a5c9f597	Remove pre-init logging	2016-05-28 02:01:50 +10:00
Matt	604f62dbd3	Remove dumb log statement	2016-05-27 11:10:36 -04:00
MattBDev	6c40ed7718	Fix Titles	2016-05-27 10:54:06 -04:00
MattBDev	e615fb4c44	Merge remote-tracking branch 'origin/master'	2016-05-26 09:19:50 -04:00
MattBDev	cc2d99849b	Optimizations and javadoc tweaks	2016-05-26 09:19:38 -04:00
manuelgu	ceb8fb9fa3	Implement PlotComponentSetEvent	2016-05-25 21:49:55 +02:00
manuelgu	d44ca23abd	Minor change to issue template (#1132)	2016-05-25 15:14:16 -04:00
manuelgu	ef60aeb017	Minor change to issue template	2016-05-25 20:54:26 +02:00
Jesse Boyd	88ad051637	Direction/chance for bo3	2016-05-26 04:14:47 +10:00
MattBDev	465f7f4504	Tweaks and doc updates.	2016-05-24 22:08:45 -04:00
Jesse Boyd	83f664129f	Fixes #1130	2016-05-23 17:27:40 +10:00
Jesse Boyd	a2a43816ad	*And this	2016-05-23 04:41:25 +10:00
Jesse Boyd	7bdcde6d24	Why was this made private?	2016-05-23 04:12:11 +10:00
Jesse Boyd	89442a0e77	Fix visit	2016-05-22 07:13:59 +10:00
Jesse Boyd	b8afbe8a00	Optimize auto trim + command cost/confirmation	2016-05-22 05:29:27 +10:00
MattBDev	e2182260d9	Fix Sponge Errors	2016-05-21 12:55:06 -04:00
MattBDev	6f26e42251	Fix Sponge Errors	2016-05-21 12:54:50 -04:00
MattBDev	13b7a798e6	ignored exception	2016-05-21 11:54:00 -04:00
MattBDev	8af30667e4	ignored exception	2016-05-21 11:18:35 -04:00
MattBDev	4bd83ab298	Logger changes	2016-05-21 11:16:21 -04:00
Jesse Boyd	7ae5042c32	Recover from bad data file ... Closes #1122	2016-05-22 01:16:04 +10:00
Jesse Boyd	3ea2d06e70	Closes #1124	2016-05-22 01:11:27 +10:00
Jesse Boyd	4ceb54b566	Add logger	2016-05-22 00:47:14 +10:00
MattBDev	dc4776d16b	Sponge changes.	2016-05-21 10:39:06 -04:00
MattBDev	b51d659ff9	Merge remote-tracking branch 'origin/master'	2016-05-20 20:29:32 -04:00
MattBDev	1768943360	Register flags	2016-05-20 20:29:16 -04:00
Jesse Boyd	6b1298a5e6	*Fix version check	2016-05-20 05:10:46 +10:00
Jesse Boyd	b125ef6668	Add git revision hash to version	2016-05-20 03:32:35 +10:00
Jesse Boyd	82e162ae00	*	2016-05-20 03:29:51 +10:00
Jesse Boyd	5665e9b709	Fix merging sometimes not removing intersection	2016-05-20 03:25:45 +10:00
Jesse Boyd	6bad640cec	Fixes #1037	2016-05-19 18:53:07 +10:00
Jesse Boyd	7873bcf592	Fixes #1102	2016-05-19 18:28:06 +10:00
Jesse Boyd	75c7fe969c	Fixes #1008	2016-05-19 18:20:23 +10:00
Jesse Boyd	1df9ae77ab	Fixes #1111	2016-05-19 18:13:37 +10:00
Jesse Boyd	78796ca7b4	Fixes #1117	2016-05-19 18:09:12 +10:00
Jesse Boyd	1ece792e2b	Create parent directory for bo3	2016-05-18 16:35:37 +10:00
MattBDev	1b9c92fd4a	Fix #1067	2016-05-17 21:52:36 -04:00
manuelgu	18e3a7553e	Fix #1085 ... Fix #1085	2016-05-15 22:05:52 -04:00
Jesse Boyd	64f3e8f79b	Fixes #1116	2016-05-15 01:54:12 +10:00