Commit Graph

1330 Commits (master)

Author SHA1 Message Date
DerFlash 6a19ec8dcc Merge branch 'master' of https://github.com/nisovin/Shopkeepers 2013-12-05 11:43:27 +01:00
DerFlash 36c93b0b87 Fix missing CreatureForceSpawnListener class in new directory structure 2013-12-05 11:43:09 +01:00
Björn Teichmann 71047122b2 Update README.md 2013-12-05 11:41:15 +01:00
Björn Teichmann cbe61b8944 Update README.md 2013-12-05 11:39:41 +01:00
DerFlash cf6d101d24 Merge branch 'maven'
Conflicts:
	src/main/java/com/nisovin/shopkeepers/ShopkeepersPlugin.java
2013-12-05 11:36:23 +01:00
blablubbabc c70367a3c3 Removed a tiny unneeded import.. 2013-12-04 22:45:26 +01:00
blablubbabc 621627f334 Removed color-code-characters from the default name-regex 2013-12-04 21:56:11 +01:00
DerFlash d564fd5674 Fix a small memory leak 2013-12-04 21:43:06 +01:00
DerFlash 8628ea21e2 - organize some imports/left overs from maven switch
- add NMS fallback code back in again
- optimize NMSManager loading -> disable when fallback code also fails
- remove some unused stuff and make more sense on log outputs
2013-12-04 21:41:27 +01:00
blablubbabc 56c302de71 Added new optional feature (default: enabled):
If 'bypass-spawn-blocking' is enabled, it will now try to "force-spawn"
LivingEntity-Shopkeepers. This should fix most issues with
Shopkeeper-Entities not being spawned due to protection plugins blocking
creature spawning. For example: WorldGuard's deny mob-spawning flag is
now bypassed.
2013-12-04 21:11:34 +01:00
blablubbabc a2d0082348 Color-codes in Shopkeeper names are now possible by default (they were
added to the default name regex in the config/settings) and get
translated to the actual color codes inside the setName(..) method of
the individual ShopObjects.
2013-12-04 20:22:25 +01:00
DerFlash c22afed509 Move base dependencies up, so the project will build in eclipse.
This also improves handling the base dependency, because we only need to change it in one place.

Yes, we want to add those basic .classpath & .project files here - still ignoring it on the other end - to provide maven build + eclipse IDE compiling right out of the box.
2013-12-04 12:48:11 +01:00
DerFlash 155885a0fb - convert to maven project
- switch to mbax’ NMS call abstraction implementation
2013-12-03 14:32:47 +01:00
nisovin 97473ecd0b Updated version to 1.16 2013-12-02 18:32:12 -07:00
nisovin 3eae716b49 Added support for item attributes 2013-12-02 18:31:45 -07:00
nisovin e8ae7ee88c Removed more old loading code 2013-12-02 14:35:30 -07:00
nisovin 3df32108ac Removed old loading code 2013-12-02 14:28:23 -07:00
nisovin ac273c2c15 Use Materials instead of ints in the settings 2013-12-02 14:23:28 -07:00
nisovin 12dd33527d README fix 2013-12-02 13:22:37 -07:00
nisovin 0ec831cf53 Updated readme 2013-12-02 13:19:37 -07:00
nisovin 4a9b27a5d6 Removed some item id warnings 2013-12-02 13:06:16 -07:00
nisovin 189db65d31 Added support for 1.7.2
Still untested
2013-12-02 12:45:27 -07:00
blablubbabc e87d72ea90 Version 1.15.1 -> 1.15.2 2013-12-02 19:17:21 +01:00
blablubbabc 8fcc7f7404 Append to previous commit: 1.6.4 volatile code is now actually used. 2013-12-02 19:16:46 +01:00
blablubbabc 488ac31927 Missing settings are now added to the config when needed. 2013-12-02 19:15:12 +01:00
blablubbabc 9fe469b066 Fixed: prevent-shop-creation-item-regular-usage also prevents player
shop creation
2013-12-02 19:07:42 +01:00
blablubbabc 79e446b062 Added volatile code for bukkit 1.6.4 2013-12-02 19:06:19 +01:00
blablubbabc 7bf318f65a Added a gitignore file to ignore non-important/project/local dependent
files from commiting.
2013-12-02 19:03:43 +01:00
nisovin bdc094b28f Initial commit 2013-12-02 10:04:27 -07:00
nisovin 41d01612ff Initial commit 2013-12-02 09:01:27 -08:00