Skip to content

v2.14: Bug fixes + Update to 1.2.3-R0.1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DiGitHubCap wants to merge 139 commits into
base: master
Choose a base branch
from
Open

v2.14: Bug fixes + Update to 1.2.3-R0.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
8c1a28f
v2.14
Mar 8, 2012
7ce58a6
Forgot .gitignore
Mar 8, 2012
1e79694
I am really bad at git...
Mar 8, 2012
55758a1
v2.15
Mar 9, 2012
170cea9
Added set circles for animal spawning
Mar 9, 2012
89ec77e
v2.16
Mar 9, 2012
c56aa19
Fixed new set circles not working (Wrong order)
Mar 10, 2012
2985f5e
Fixed not being required to learn the new set circles *not tested yet*
Mar 10, 2012
45ee5b7
v2.17
Mar 11, 2012
b479a62
Added set circle 0111 (Teleport to your home; costs 16 hunger)
Mar 14, 2012
72e776b
v2.18
Mar 14, 2012
84404b7
Note: Almost pushed this to the master branch by accident. Phew! Chec…
Mar 17, 2012
c707105
v2.18... again? Git is confusing :/
Mar 17, 2012
f83190c
Now using an additional version number to indicate the dev patch vers…
Mar 17, 2012
d438dd2
Since the home-tp-suffocation fix seems to be working... v2.19. Also,…
Mar 17, 2012
e177a29
Blacklist transmuting from chests, signs, furnaces, brewing stands, a…
Mar 19, 2012
4fb1104
Fixed players getting XP when trying to transmute blacklisted blocks …
Mar 19, 2012
1c5f1ac
Fixed console message for players transmuting blacklisted blocks when…
Mar 20, 2012
1400a24
Added the blocks the waplayer was converting from and to into the con…
Mar 20, 2012
3700cd4
v2.20
Mar 30, 2012
15a6e52
Formatting
Jun 8, 2012
45f6571
Remove giving items on death when level is high
Jun 8, 2012
174b0d3
Vault support
Jun 8, 2012
c6e8651
Transmutation circle permissions
Jun 8, 2012
49e537b
Added support for different block subtypes
Jun 8, 2012
feeac9d
Fixed teleportation circles not working in some directions when using…
Jun 8, 2012
a7254c5
Lightning only activates if you click on the proper block for the tra…
Jun 8, 2012
3612e91
Disallow transmuting mob spawners
Jun 8, 2012
e9b6dcb
Added messages when a player is too hungry to use a circle
Jun 8, 2012
21de0dd
Fixed potential resource leak and close sacrifices.txt when done with it
Jun 8, 2012
dde443e
Some formatting
Jun 8, 2012
4ffd653
Quick fix to save me time figuring out how to work git
Jun 8, 2012
f609b65
Legal stuff
Jun 8, 2012
0e307ab
v2.3 (Big thanks to ryvix/ty2u for doing pretty much everything in th…
Jun 8, 2012
8d5535b
Added some checks to food cost
Jun 12, 2012
eb373dc
Woops I have this file in a different folder
Jun 12, 2012
3017a8a
Change dependency on Vault to soft dependency
Jun 12, 2012
a8a5dae
IMPORTANT: Breaking changes\!
Jun 14, 2012
b4fc9e0
Hacky 'pull' from ty2u
Jun 14, 2012
b052b96
Merge branch 'dev'
Jun 14, 2012
16311c4
v2.4
Jun 14, 2012
215d451
Set Circle 1133 now keeps enchants when repairing items.
Jun 14, 2012
b74d838
Updated .gitignore
Jun 14, 2012
cc6e971
Where do these .orig files come from anyway?
Jun 14, 2012
a61e99f
Another 'fake' merge from ty2u
Jun 14, 2012
1299b4e
v2.4.1 (Beta)
Jun 14, 2012
9f8bb08
Plugin Metrics
Jun 14, 2012
63b2244
Preparing simulation events (thanks to Lyneira's code). Note: There i…
Jun 15, 2012
b73e265
Quick fix
Jun 15, 2012
db89698
Permissions fix (I must have been really tired when I made those perm…
Jun 17, 2012
c56ff40
v2.4.2 (FIX, Beta)
Jun 17, 2012
ffd03c6
Transmutation block event simulation (Tested and fully functional)
Jun 17, 2012
4aab224
Configurable block values
Jun 17, 2012
f1d3969
v2.5
Jun 17, 2012
3f2e715
Remove unneeded code
Jun 18, 2012
e977302
Permissions fix (again)
Jun 18, 2012
e316045
Merge branch 'dev'
Jun 18, 2012
aaa5f05
v2.6
Jun 18, 2012
4ab0ad3
Fixed crafting table security exploit
Jun 20, 2012
6141344
v2.6.1
Jun 21, 2012
c0b61ce
Merge from upstream and add AntiCheat checks
Jul 4, 2012
93bf1b6
Another AntiCheat check
Jul 4, 2012
8350589
Remove an unneeded AntiCheat check
Jul 4, 2012
c1292e2
Trying to fix an NPE
Jul 4, 2012
4c6cf72
Add charge param for fire circle so it doesn't take all our energy
Jul 4, 2012
347921a
Fix AntiCheat checks
Jul 4, 2012
c14de2b
Add config option for philosopher stone modifier
Jul 5, 2012
32ecf7b
-No philosopher stone modifier on transmutes
Jul 6, 2012
0015735
Default philosopher stone modifier set to 1
Jul 6, 2012
7d909d9
-Move AntiCheat checks
Jul 6, 2012
06a73a9
-Send message when already sacrificed
Jul 7, 2012
e15ccb9
-Add cooldowns to transmute and set circles with config
Jul 7, 2012
0f0dc34
Re-formatting to keep things on the same line (auto formatter)
Jul 7, 2012
5711b10
Show seconds remaining of cooldowns.
Jul 7, 2012
6bb78b2
Add config option for applying philosopher's stone to transmutes
Jul 7, 2012
ed3cd02
-Move AntiCheat stuff to a better spot
Jul 7, 2012
5c37f8b
Fixed typo
Jul 7, 2012
b2f2956
Fix geometricmagic.transmutation.5
Jul 8, 2012
e32dcca
Add permission to bypass cooldowns
Jul 8, 2012
5de9d93
Add permission to bypass hunger being taken away
Jul 8, 2012
6940ad9
Fix NPE
Jul 8, 2012
98888be
Fix missing bypasshunger permission check
Jul 8, 2012
a4d11c8
fix up /setcircle a bit
Jul 11, 2012
18243d4
-More /setcircle fixes
Jul 11, 2012
5977edf
Add limit to number arrows to check
Jul 17, 2012
a598a77
Strike lightning still if any tools were repaired
Jul 17, 2012
b45309f
Use fireballs for explosion circles so Towny can regen them
Jul 18, 2012
9992eb2
Move init variable to proper spot
Jul 18, 2012
9f3114c
Remove unnecessary checkBlockBreakSimulation
Jul 18, 2012
1e85d89
Support for customisable data values in transmutation part 1 (config)
Aug 4, 2012
4991a82
Support for customisable data values in transmutation part 2 (code)
Aug 4, 2012
fffa759
v2.6.2
Aug 4, 2012
1a2b3f9
Missed a spot
Aug 4, 2012
ac018cc
And another one
Aug 4, 2012
5aa6f17
Fixed using wrong block A data
Aug 4, 2012
a24d1b9
v2.6.3
Aug 4, 2012
984e8a1
Fixed comparing wrong data
Aug 4, 2012
df46719
v2.6.4
Aug 4, 2012
e2dae0b
Proper block blacklisting
Aug 5, 2012
dbb986b
Forgot to save the file
Aug 5, 2012
cfdf6a9
Attempt fix for NullPointerException via refactor
Aug 5, 2012
5c9e706
Another refactor and a correction
Aug 5, 2012
8a07b62
Can't use String.equals with an integer
Aug 5, 2012
809e920
v2.6.5
Aug 5, 2012
45fe2a0
v2.7
Aug 5, 2012
87e402a
'geometricmagic.standard' should be true by default
Aug 5, 2012
b59ef4c
v2.7.1
Aug 5, 2012
c09f986
That went overlooked for a long time
Aug 15, 2012
f07017f
Minor refactor
Aug 15, 2012
c258051
Forgot this part
Aug 16, 2012
d5e789a
Most likely fixed remote set circles (using both flint and micro circ…
Aug 18, 2012
355a334
v2.7.2
Aug 18, 2012
fab21e0
Remove debug code
Aug 18, 2012
94199da
No need for that
Aug 21, 2012
887d235
Added '/geometricmagic [reload]' commands
Aug 21, 2012
361450d
Added auto update notification and auto config updates
Aug 22, 2012
f9e3fd6
No point ignoring a perfectly good config value
Aug 22, 2012
dc4cc74
Fix permission for /circles
Aug 22, 2012
d2699df
v2.7.4
Aug 22, 2012
d46154c
Looping update check (1 hour intervals), fixed + improved config updater
Aug 22, 2012
ff69a27
Improved update notification message
Aug 22, 2012
79dda14
Added console output when config first generates
Aug 22, 2012
4e4346f
Replace all output using 'this' (except the enable and disable messag…
Aug 22, 2012
43a3531
Command aliases
Aug 22, 2012
4078b0b
Prevent players from using items with set circle 1222
Aug 23, 2012
ec63b0d
Refactoring
Aug 25, 2012
15d9b24
Even more refactoring (hopefully resulting in performance improvements)
Aug 25, 2012
93ad1b7
Thread safety
Aug 25, 2012
f31ba00
Unfinished threading rewrite of transmutation
Aug 26, 2012
f94a5d9
Unfinished threading rewrite of transmutation
Aug 26, 2012
6306f2f
Unfinished threading rewrite of transmutation
Aug 26, 2012
c0f25e1
Completed transmutation threading overhaul
Aug 26, 2012
1d2d157
v2.7.6
Aug 26, 2012
aa8f682
Set circle 1111 (Spawn Weapon)
Aug 28, 2012
27cbd43
Remove unneeded AntiCheat exemption
Aug 29, 2012
8459a38
Check for the 'prongs' in the transmutation circle
Aug 29, 2012
5662ccd
Storage circles
Aug 30, 2012
bbb1975
v2.8.0
Aug 30, 2012
cd7ca6b
Merged branch dev
Aug 30, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Compiled source #
###################
*.class
*.jar

# Eclipse #
###########
*.classpath
*.project

# System #
##########
.directory
*~

# Unknown #
###########
*.orig
621 changes: 621 additions & 0 deletions COPYING
View file
Open in desktop

Large diffs are not rendered by default.

Loading