1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Commit Graph

969 Commits

Author SHA1 Message Date
TheBusyBiscuit
ecde46616a Climbing Pick no longer causes fall damage 2020-08-24 20:59:01 +02:00
TheBusyBiscuit
89a5db2593 Fixed Unit Tests for Climbing Pick 2020-08-24 20:45:45 +02:00
TheBusyBiscuit
9e92f64222 Added damageable setting 2020-08-24 20:35:35 +02:00
TheBusyBiscuit
8c2038634f Fixed dual wielding climbing picks and added messages 2020-08-24 20:31:54 +02:00
TheBusyBiscuit
b81959e7a0 Added dual-wielding to the Climbing Pick 2020-08-24 20:19:24 +02:00
TheBusyBiscuit
29092b87c9
Merge branch 'experimental' into IcePick 2020-08-20 22:56:09 +02:00
TheBusyBiscuit
d8d4811974 Merged Nitwit Rune and Shulker Shell PRs 2020-08-20 18:20:25 +02:00
TheBusyBiscuit
65021f7615
Merge branch 'rune' into ShulkerShell 2020-08-20 17:33:27 +02:00
LinoxGH
73d623a0fd
Github Web and its indent issues. 2020-08-20 14:39:31 +03:00
LinoxGH
37bacaa8cb
Apparently SlimefunPlugin.instance is private now. 2020-08-20 14:30:21 +03:00
LinoxGH
bf3b04a4c5
Oops sorry for this silly mistake 2020-08-20 14:19:48 +03:00
LinoxGH
0946b88cd1
Fixed symbol name issues in ClimbingPick.java 2020-08-20 14:11:46 +03:00
LinoxGH
a54e8623d3
Merge branch 'master' into ShulkerShell 2020-08-20 12:21:50 +03:00
LinoxGH
5f78e7a854
Merge branch 'master' into IcePick 2020-08-20 11:43:14 +03:00
TheBusyBiscuit
9787cf734b Renamed to Nitwit Rune 2020-08-19 14:31:07 +02:00
TheBusyBiscuit
b1abf7bb99 Fixed categories 2020-08-19 14:12:51 +02:00
TheBusyBiscuit
8c5d15e311 Increased Bartering chance 2020-08-19 14:11:33 +02:00
TheBusyBiscuit
66fa277014 A few additional changes 2020-08-19 14:07:42 +02:00
TheBusyBiscuit
57b3f06aa6
Merge pull request #2220 from dniym/NitwitRune
Added Rune of Unemployment
2020-08-19 13:58:16 +02:00
TheBusyBiscuit
aa22e7c9b2 [CI skip] A bit of refactoring and documentation 2020-08-19 13:54:46 +02:00
dniym
e13e7e1400
Update RuneOfUnemployment.java
made requested changes
2020-08-18 15:30:12 -04:00
TheBusyBiscuit
9d4d2060ba [CI skip] Added a few more strings to translation files 2020-08-18 14:45:51 +02:00
TheBusyBiscuit
6be0709aea Fixes #2138 2020-08-18 14:18:44 +02:00
TheBusyBiscuit
8e8a87fce6 Fixed ChestTerminal timings showing up as cargo nodes 2020-08-17 17:31:15 +02:00
TheBusyBiscuit
fb47574fe8
Added poma's requested change
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-08-17 16:27:26 +02:00
TheBusyBiscuit
a10813036b
Added poma's suggested change
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
2020-08-17 13:30:18 +02:00
TheBusyBiscuit
0f73b62658
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-08-17 13:30:03 +02:00
TheBusyBiscuit
07c62d5932
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-08-17 13:29:54 +02:00
TheBusyBiscuit
33f6f039ec
Added Walshys suggested change
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-08-17 13:29:44 +02:00
TheBusyBiscuit
d4953dd029 [CI skip] Added more Unit Tests 2020-08-17 13:00:22 +02:00
TheBusyBiscuit
1bba2efa3e [CI skip] Added more unit tests 2020-08-17 02:23:28 +02:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
TheBusyBiscuit
c98fe74ea9
Merge branch 'master' into NitwitRune 2020-08-17 00:25:18 +02:00
dniym
42e4b1620d
Update SlimefunItemSetup.java
Fixed merge conflict 2
2020-08-16 13:52:09 -04:00
dniym
45b63a149b
Update HeadTexture.java
Resolved Merge Conflict 1
2020-08-16 13:45:18 -04:00
dniym
b22bdb55ff Made requested changes 2020-08-16 13:33:36 -04:00
TheBusyBiscuit
2a8abcbdbf Fixed unit tests, also improved test coverage 2020-08-16 15:57:09 +02:00
TheBusyBiscuit
037e8d83df Small performance improvement, also reduced technical debt a bit 2020-08-16 15:49:47 +02:00
TheBusyBiscuit
eb5b2678e0 Fixes #2077 2020-08-14 01:46:05 +02:00
dniym
644878c534 Made Requested Changes 2020-08-13 16:21:18 -04:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +02:00
dniym
a33cfdb12d added a check for jobless villagers 2020-08-12 16:08:15 -04:00
dniym
a1be08034b made requested changes 2020-08-12 16:04:35 -04:00
dniym
b27059240b Added Rune of Unemployment
Approved Suggestion: #284 - Vitamin_CE#9804
2020-08-11 20:58:17 -04:00
TheBusyBiscuit
923b59c6e7 [CI skip] Reduced technical debt 2020-08-11 16:28:52 +02:00
TheBusyBiscuit
e406481b98 [CI skip] Replaced the last tabs with spaces 2020-08-11 16:23:31 +02:00
TheBusyBiscuit
1aaedf0825 [CI skip] Added more Unit Tests 2020-08-11 11:17:08 +02:00
TheBusyBiscuit
485a80f6ef Fixes #2209 2020-08-09 11:41:15 +02:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
7de9dd6683 Industrial Miners can now also mine Gilded Blackstone 2020-08-08 12:51:26 +02:00