poma123
|
6e4ad1345f
|
This has to be async
|
2020-09-10 13:58:58 +02:00 |
|
TheBusyBiscuit
|
6c7af43574
|
Merge pull request #2304 from poma123/develop/machine-process-complete-event
MachineProcessCompleteEvent
|
2020-09-10 12:16:35 +02:00 |
|
TheBusyBiscuit
|
00e71904b2
|
Merge pull request #2305 from LinoxGH/patch-3
Edited markDirty() to clean connectorCache
|
2020-09-09 23:33:06 +02:00 |
|
LinoxGH
|
1b80c698c5
|
Fixed a typo.
|
2020-09-09 21:36:29 +03:00 |
|
LinoxGH
|
6d6359ce26
|
Improved the code.
|
2020-09-09 16:50:04 +03:00 |
|
poma123
|
8f34365aaa
|
Removed redundant annotations
|
2020-09-09 14:51:21 +02:00 |
|
poma123
|
87543ccb83
|
Fixed javadocs
|
2020-09-09 14:35:17 +02:00 |
|
poma123
|
a4eb852b19
|
Added annotations
|
2020-09-09 14:34:01 +02:00 |
|
poma123
|
25bd60fd0e
|
Fixed a typo
|
2020-09-09 14:26:01 +02:00 |
|
poma123
|
274c5ada2f
|
Minor improvement
|
2020-09-09 14:25:47 +02:00 |
|
poma123
|
e628ad2685
|
Added MachineProcessCompleteEvent
|
2020-09-09 14:25:20 +02:00 |
|
TheBusyBiscuit
|
f2eeadb24b
|
[CI skip] Some minor changes
|
2020-09-09 13:18:43 +02:00 |
|
TheBusyBiscuit
|
3a5c1ee22b
|
[CI skip] Removed deprecated class
|
2020-09-08 12:22:57 +02:00 |
|
TheBusyBiscuit
|
23143cd576
|
Merge pull request #2297 from LinoxGH/patch-2
Possibly fixes #2296.
|
2020-09-08 12:06:57 +02:00 |
|
TheBusyBiscuit
|
fe22c5e9ed
|
Fixes #2300 (and deprecated bStats)
|
2020-09-08 12:06:12 +02:00 |
|
Daniel Walsh
|
53dea5e195
|
Some good old micro-optimisations
|
2020-09-07 22:38:23 +01:00 |
|
LinoxGH
|
956d8ed078
|
Did the requested changes.
|
2020-09-07 18:47:51 +03:00 |
|
LinoxGH
|
cdd7dc9232
|
Forgot to change a small part.
|
2020-09-07 13:38:12 +03:00 |
|
LinoxGH
|
7cd2e53bf1
|
Possibly fixes #2296.
|
2020-09-07 13:22:59 +03:00 |
|
TheBusyBiscuit
|
5c0aba7692
|
[CI skip] Moved Slimefun repository
|
2020-09-06 17:19:02 +02:00 |
|
Ome_R
|
490db0d719
|
Fixed teleporters not functioning if the teleport event is cancelled
|
2020-09-06 12:22:37 +03:00 |
|
Nameless
|
3b9a42713a
|
Translate researches_zh-CN.yml via GitLocalize
|
2020-09-06 04:24:14 +00:00 |
|
TheBusyBiscuit
|
4ef4332ffa
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-09-06 04:24:10 +00:00 |
|
TheBusyBiscuit
|
be5f1ed8ee
|
Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix
Multitool offhand hunger consumption fix
|
2020-09-05 22:15:47 +02:00 |
|
FluffyBear
|
6e33549006
|
Got rid of the extra imports
|
2020-09-05 15:11:29 -05:00 |
|
FluffyBear
|
069b183b68
|
Changed it back
|
2020-09-05 15:11:08 -05:00 |
|
FluffyBear
|
c9fd33318e
|
Did changes
|
2020-09-05 11:12:14 -05:00 |
|
TheBusyBiscuit
|
2791da3796
|
A bit redundant
|
2020-09-05 15:01:26 +02:00 |
|
TheBusyBiscuit
|
ec9133cf8a
|
Small improvements
|
2020-09-05 14:45:42 +02:00 |
|
TheBusyBiscuit
|
8061df9b5e
|
[CI skip] More nullability annotations
|
2020-09-05 13:56:56 +02:00 |
|
TheBusyBiscuit
|
5f897de0b0
|
[CI skip] Merge pull request #2287 from TheBusyBiscuit/gitlocalize-12867
messges_es
|
2020-09-05 09:57:06 +02:00 |
|
Luu7
|
1c1b2251d0
|
Translate researches_es.yml via GitLocalize
|
2020-09-04 20:21:14 +00:00 |
|
Luu7
|
d11145d98c
|
Translate messages_es.yml via GitLocalize
|
2020-09-04 20:09:41 +00:00 |
|
FluffyBear
|
6f49044998
|
Applied fix
|
2020-09-04 10:20:11 -05:00 |
|
FluffyBear
|
6ac3c9698b
|
Fixed dual wielding problem with shears
|
2020-09-04 09:29:08 -05:00 |
|
TheBusyBiscuit
|
120d3299ee
|
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841
New pull request
|
2020-09-04 10:02:31 +02:00 |
|
TheBusyBiscuit
|
0c3cb5db37
|
[CI skip] Updated it once again
|
2020-09-04 10:02:20 +02:00 |
|
TheBusyBiscuit
|
deb9e0c711
|
[CI skip] Updated translator list
|
2020-09-04 09:57:34 +02:00 |
|
FluffyBear
|
55bf76799f
|
Got rid of charge command from this branch (Missed something)
|
2020-09-04 00:54:53 -05:00 |
|
FluffyBear
|
cf1c58dd8b
|
Got rid of charge command from this branch
|
2020-09-04 00:54:06 -05:00 |
|
FluffyBear
|
90309dabe1
|
Fixed multitools consuming hunger when used in offhand
|
2020-09-04 00:46:26 -05:00 |
|
FluffyBear
|
649d4797c9
|
Merge pull request #1 from TheBusyBiscuit/master
Update to latest
|
2020-09-04 00:40:03 -05:00 |
|
Pierre
|
1ee04e79b3
|
Translate messages_fr.yml via GitLocalize
|
2020-09-03 22:17:25 +00:00 |
|
amarcais53
|
d22c14e5a6
|
Translate researches_fr.yml via GitLocalize
|
2020-09-03 18:23:24 +00:00 |
|
TheBusyBiscuit
|
26f9e5f7c6
|
More annotations and refactoring
|
2020-09-03 17:19:24 +02:00 |
|
TheBusyBiscuit
|
dd9962d3e2
|
Small improvement, many annotations
|
2020-09-03 12:24:49 +02:00 |
|
TheBusyBiscuit
|
cc2dd0dd64
|
Translate messages_ja.yml via GitLocalize
|
2020-09-03 05:32:59 +00:00 |
|
bito-blosh
|
af89dba9f6
|
Translate researches_ja.yml via GitLocalize
|
2020-09-03 05:32:27 +00:00 |
|
TheBusyBiscuit
|
f4869991ca
|
Moved Nether goo to the appropriate package (+ more annotations)
|
2020-09-02 14:47:32 +02:00 |
|
TheBusyBiscuit
|
4ce4388218
|
[CI skip] More annotations :o
|
2020-09-02 13:53:10 +02:00 |
|
TheBusyBiscuit
|
c5630791c0
|
Added item break sound to some tools
|
2020-09-02 12:19:18 +02:00 |
|
TheBusyBiscuit
|
d0498f51c5
|
Translate messages_de.yml via GitLocalize
|
2020-09-02 10:13:36 +00:00 |
|
TheBusyBiscuit
|
2dfa2f139b
|
Translate researches_de.yml via GitLocalize
|
2020-09-02 10:13:35 +00:00 |
|
TheBusyBiscuit
|
2fadb47e65
|
Merge pull request #2277 from TheBusyBiscuit/gitlocalize-12801
Updated TR localization
|
2020-09-02 12:09:48 +02:00 |
|
TheBusyBiscuit
|
3b28545714
|
Little tweak
|
2020-09-02 12:08:36 +02:00 |
|
TheBusyBiscuit
|
f1515edae9
|
Fixed Synthetic Shulker Shells missing
|
2020-09-02 12:07:16 +02:00 |
|
LinoxGH
|
4fde84d521
|
Translate researches_tr.yml via GitLocalize
|
2020-09-02 10:06:23 +00:00 |
|
LinoxGH
|
7db615fb82
|
Translate messages_tr.yml via GitLocalize
|
2020-09-02 10:06:20 +00:00 |
|
TheBusyBiscuit
|
8a6e00a402
|
Even more annotations
|
2020-09-02 11:53:42 +02:00 |
|
TheBusyBiscuit
|
71322d95a8
|
More annotations
|
2020-09-02 11:27:53 +02:00 |
|
TheBusyBiscuit
|
486253973c
|
Renamed to Villager Rune
|
2020-09-02 11:16:45 +02:00 |
|
TheBusyBiscuit
|
eb9837953c
|
Delete RangedItemSetting.java
|
2020-09-02 11:13:16 +02:00 |
|
TheBusyBiscuit
|
7da5b9ad35
|
Merge branch 'master' into experimental
|
2020-09-02 10:34:13 +02:00 |
|
TheBusyBiscuit
|
f4091e931b
|
Refactoring and some annotations
|
2020-09-02 10:31:35 +02:00 |
|
TheBusyBiscuit
|
35c1fa6a23
|
Fixes #2275
|
2020-09-01 22:38:22 +02:00 |
|
BuildTools
|
c091c7992f
|
Removed redundancies, added javadocs, fixed formatting
|
2020-08-31 18:50:35 -05:00 |
|
BuildTools
|
125c3fe60d
|
Updated plugin.yml to include new charge command
|
2020-08-31 15:34:56 -05:00 |
|
BuildTools
|
16ea468c38
|
Added command to charge items
|
2020-08-31 15:31:09 -05:00 |
|
TheBusyBiscuit
|
4a6068b078
|
Refactoring
|
2020-08-31 20:38:01 +02:00 |
|
TheBusyBiscuit
|
93ff508603
|
More refactoring
|
2020-08-31 20:37:24 +02:00 |
|
TheBusyBiscuit
|
759946f5c3
|
[Ci skip] Reduced technical debt
|
2020-08-31 20:18:35 +02:00 |
|
TheBusyBiscuit
|
3d22e42bef
|
Merge pull request #2270 from LinoxGH/master
Fixes #2265 <Tested>
|
2020-08-31 19:56:05 +02:00 |
|
TheBusyBiscuit
|
8073b5dafb
|
Fixes #2266
|
2020-08-31 19:49:25 +02:00 |
|
LinoxGH
|
6dba662d4b
|
Merge branch 'master' into master
|
2020-08-31 20:34:15 +03:00 |
|
TheBusyBiscuit
|
68b9a0aed8
|
Fixes #2269 (+ refactoring)
|
2020-08-31 19:08:15 +02:00 |
|
LinoxGH
|
d95049db27
|
Did the requested change.
|
2020-08-31 19:13:23 +03:00 |
|
LinoxGH
|
f740cc7850
|
Did the requested change.
|
2020-08-31 19:04:23 +03:00 |
|
LinoxGH
|
fa01e82179
|
Did the requested changes.
|
2020-08-31 18:51:21 +03:00 |
|
LinoxGH
|
e2c93c54e5
|
Fixes #2265 <Tested>
|
2020-08-31 17:28:26 +03:00 |
|
LinoxGH
|
918edbeeb1
|
Fixed the javadocs.
|
2020-08-30 18:42:57 +03:00 |
|
LinoxGH
|
bfc84d03b2
|
Undid the changes to language files.
|
2020-08-30 18:26:12 +03:00 |
|
LinoxGH
|
305dd57b39
|
Did the requested change.
|
2020-08-30 18:25:08 +03:00 |
|
LinoxGH
|
dffc5758e2
|
Fixed compilation error.
|
2020-08-30 18:21:50 +03:00 |
|
LinoxGH
|
a8f6f51724
|
Added a new message.
|
2020-08-30 18:15:31 +03:00 |
|
LinoxGH
|
3d0c642477
|
Added an additional check for Wind Staff
|
2020-08-30 18:14:39 +03:00 |
|
LinoxGH
|
cdb6eeab96
|
Did the requested changes.
|
2020-08-30 18:13:45 +03:00 |
|
LinoxGH
|
e0914af6d9
|
Fixes #2263
|
2020-08-30 17:53:39 +03:00 |
|
TheBusyBiscuit
|
6b4f914784
|
Some more refactoring
|
2020-08-29 14:20:33 +02:00 |
|
TheBusyBiscuit
|
e3f7e68468
|
Fixed a merging issue
|
2020-08-29 14:09:41 +02:00 |
|
TheBusyBiscuit
|
dc233997ae
|
Merge branch 'master' into refactoring/block-energy
|
2020-08-29 12:47:50 +02:00 |
|
TheBusyBiscuit
|
ac5d5521ce
|
Fixes #2260
|
2020-08-28 23:35:11 +02:00 |
|
TheBusyBiscuit
|
ec6f48e374
|
[CI skip] Refactoring
|
2020-08-28 23:35:05 +02:00 |
|
TheBusyBiscuit
|
5bef6a9ec8
|
Fixes #2257
|
2020-08-28 23:18:43 +02:00 |
|
TheBusyBiscuit
|
9d740436a7
|
Merge branch 'master' into experimental
|
2020-08-28 20:53:20 +02:00 |
|
TheBusyBiscuit
|
83b66232fa
|
Fixes #2251
|
2020-08-28 20:03:45 +02:00 |
|
LinoxGH
|
f371a5fda6
|
Fixed a stupid issue and added some docs.
|
2020-08-27 20:53:13 +03:00 |
|
LinoxGH
|
8c1cccc390
|
Forgot about imports.
|
2020-08-27 20:33:01 +03:00 |
|
LinoxGH
|
fd665843a0
|
Did requested changes.
|
2020-08-27 20:20:13 +03:00 |
|
LinoxGH
|
53abf76a35
|
Fixed Fluid Pump dupe.
|
2020-08-27 20:08:02 +03:00 |
|
TheBusyBiscuit
|
f97935b5c7
|
Deleted unused class
|
2020-08-27 14:29:02 +02:00 |
|
TheBusyBiscuit
|
fcbae02a4b
|
Fixs #2208
|
2020-08-27 14:16:09 +02:00 |
|
TheBusyBiscuit
|
4232caf17a
|
[CI skip] Reduced technical debt
|
2020-08-27 13:16:38 +02:00 |
|
TheBusyBiscuit
|
b9b3d7f504
|
[CI skip] Removed deprecated class
|
2020-08-27 13:00:36 +02:00 |
|
TheBusyBiscuit
|
4dab0c5b47
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy
|
2020-08-26 17:51:43 +02:00 |
|
TheBusyBiscuit
|
3bc943bdb2
|
Little bit of refactoring
|
2020-08-26 14:33:40 +02:00 |
|
TheBusyBiscuit
|
c8ab9e8568
|
Fixes #1022
|
2020-08-26 14:31:51 +02:00 |
|
TheBusyBiscuit
|
6e6a953009
|
Fixes #2249
|
2020-08-26 12:47:08 +02:00 |
|
TheBusyBiscuit
|
2c319d866f
|
Fixed Unit Test
|
2020-08-25 01:17:11 +02:00 |
|
TheBusyBiscuit
|
dba52edc47
|
Merge branch 'master' into experimental
|
2020-08-24 21:12:38 +02:00 |
|
TheBusyBiscuit
|
4bc22ab106
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental
Conflicts:
CHANGELOG.md
|
2020-08-24 21:12:04 +02:00 |
|
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
|
076ae6532b
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-24 18:12:31 +02:00 |
|
poma123
|
7b7c6350c6
|
Fixed android script editor menu hotkey glitch
|
2020-08-24 15:30:51 +02:00 |
|
TheBusyBiscuit
|
605862b400
|
Improved consistency and reduced redundancy
|
2020-08-24 14:26:11 +02:00 |
|
TheBusyBiscuit
|
a2b2478394
|
Update EnergyNet.java
|
2020-08-24 02:18:32 +02:00 |
|
TheBusyBiscuit
|
d998f3ec8c
|
Merge branch 'master' into refactoring/block-energy
|
2020-08-24 02:11:59 +02:00 |
|
TheBusyBiscuit
|
155092a321
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
Conflicts:
pom.xml
|
2020-08-23 17:57:13 +02:00 |
|
TheBusyBiscuit
|
f51a19777f
|
[CI skip] Added more Unit tests
|
2020-08-23 17:56:38 +02:00 |
|
Sfiguz7
|
89fdf45d28
|
I said, fixed extra indentation
|
2020-08-23 17:50:31 +02:00 |
|
Sfiguz7
|
44451d6244
|
Fixed extra indentation
|
2020-08-23 17:49:44 +02:00 |
|
Sfiguz7
|
813200b29c
|
Made requested changes
|
2020-08-23 15:36:10 +02:00 |
|
Sfiguz7
|
e06d17f8e5
|
Restored original plugin.yml as pulling hadn't
|
2020-08-23 13:58:29 +02:00 |
|
Sfiguz7
|
bdd2adc21e
|
Cleared unused imports I forgot to delete
|
2020-08-23 13:56:39 +02:00 |
|
Sfiguz7
|
eb66f3e183
|
Added option to drop excess items on /sf give
|
2020-08-23 13:54:51 +02:00 |
|
TheBusyBiscuit
|
ec95797cbf
|
Fixes #2240
|
2020-08-22 02:38:17 +02:00 |
|
TheBusyBiscuit
|
b36e3e41a8
|
Reduced technical debt
|
2020-08-22 02:36:36 +02:00 |
|
TheBusyBiscuit
|
e839ece670
|
Reduced technical debt
|
2020-08-22 00:57:44 +02:00 |
|
100petr
|
d6e519c840
|
Translate messages_cs.yml via GitLocalize
|
2020-08-21 13:27:22 +00:00 |
|
TheBusyBiscuit
|
95655dc6fc
|
A few fixes and performance improvements
|
2020-08-21 15:19:08 +02:00 |
|
TheBusyBiscuit
|
167326292d
|
Maybe fixes #1951 (+ performance improvements)
|
2020-08-20 23:25:43 +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 |
|
TheBusyBiscuit
|
88be3e79ff
|
Merge branch 'master' into refactoring/block-energy
|
2020-08-20 16:55:35 +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 |
|
Vravinite
|
310622c3ac
|
Translate messages_es.yml via GitLocalize
|
2020-08-19 23:50:04 +00:00 |
|
LinoxGH
|
5f0df75b81
|
Translate messages_tr.yml via GitLocalize
|
2020-08-19 12:42:33 +00:00 |
|
TheBusyBiscuit
|
4f3854877b
|
[CI skip] Merge pull request #2230 from TheBusyBiscuit/gitlocalize-12659
Updated Russian localizations
|
2020-08-19 14:37:35 +02:00 |
|
TheBusyBiscuit
|
15487fb333
|
Translate messages_de.yml via GitLocalize
|
2020-08-19 12:33:36 +00:00 |
|
TheBusyBiscuit
|
9787cf734b
|
Renamed to Nitwit Rune
|
2020-08-19 14:31:07 +02:00 |
|
SoSeDiK
|
273e459e26
|
Translate recipes_ru.yml via GitLocalize
|
2020-08-19 12:20:10 +00:00 |
|
SoSeDiK
|
dbd5cc1641
|
Translate messages_ru.yml via GitLocalize
|
2020-08-19 12:20:08 +00: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
|
85b0c80e3f
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-17 17:31:39 +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 |
|
Scott Gomez Andoy
|
646fb6d523
|
Translate messages_tl.yml via GitLocalize
|
2020-08-17 11:26:10 +00:00 |
|
TheBusyBiscuit
|
d4953dd029
|
[CI skip] Added more Unit Tests
|
2020-08-17 13:00:22 +02:00 |
|
TheBusyBiscuit
|
0d27a787ab
|
Added a new config option for setting Players on fire when radioactive
|
2020-08-17 02:23:59 +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 |
|
Luu7
|
9a6b8d697d
|
Translate messages_es.yml via GitLocalize
|
2020-08-14 21:53:14 +00:00 |
|
TheBusyBiscuit
|
bae8421511
|
Translate messages_de.yml via GitLocalize
|
2020-08-13 23:51:00 +00:00 |
|
TheBusyBiscuit
|
8b02c18bb4
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-14 01:46:25 +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 |
|
LinoxGH
|
acfc3c6880
|
Translate messages_tr.yml via GitLocalize
|
2020-08-13 19:53:13 +00: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 |
|
Nameless
|
517bd6139e
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-08-10 06:47:24 +00:00 |
|
LinoxGH
|
9175f27fdd
|
Translate messages_tr.yml via GitLocalize
|
2020-08-09 14:59:09 +00:00 |
|
Luu7
|
adddf4811d
|
Translate messages_es.yml via GitLocalize
|
2020-08-09 13:07:04 +00:00 |
|
TheBusyBiscuit
|
bb40017985
|
Translate messages_de.yml via GitLocalize
|
2020-08-09 09:48:03 +00:00 |
|
TheBusyBiscuit
|
e4f5ea62d9
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-09 11:44:03 +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
|
e6958f8e34
|
[CI skip] Merge pull request #2210 from TheBusyBiscuit/gitlocalize-12575
Updated messages_zh-CN.yml
|
2020-08-09 11:20:57 +02:00 |
|
Nameless
|
af32c0ed4a
|
Translate recipes_zh-CN.yml via GitLocalize
|
2020-08-09 08:20:48 +00:00 |
|
Nameless
|
a3f58150ee
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-08-09 08:17:17 +00:00 |
|
TheBusyBiscuit
|
7de9dd6683
|
Industrial Miners can now also mine Gilded Blackstone
|
2020-08-08 12:51:26 +02:00 |
|
TheBusyBiscuit
|
9f49dd3981
|
Reduced technical debt
|
2020-08-08 12:47:39 +02:00 |
|
TheBusyBiscuit
|
c08eadcaae
|
Small performance improvement
|
2020-08-08 00:48:09 +02:00 |
|
TheBusyBiscuit
|
bffbb488ba
|
[CI skip] Added Unit Tests for Piglins
|
2020-08-08 00:45:01 +02:00 |
|
poma123
|
c2fa590aa1
|
Requested changes
|
2020-08-07 22:43:58 +02:00 |
|
poma123
|
6ab196a03d
|
Requested changes
|
2020-08-07 22:04:15 +02:00 |
|
poma123
|
87f8e7ae8c
|
Fixed Industrial Miner debris issue
|
2020-08-07 21:46:59 +02:00 |
|
TheBusyBiscuit
|
9b21c1ade1
|
Merge pull request #2202 from dniym/elecPressSand
Elec press sand
|
2020-08-07 19:10:11 +02:00 |
|
TheBusyBiscuit
|
99d07c42e5
|
[CI skip] Update MockBukkit
|
2020-08-07 19:05:51 +02:00 |
|
dniym
|
1fde84a4c7
|
Approved Suggestion #272 - AutoBio#8746
|
2020-08-06 21:08:59 -04:00 |
|
TheBusyBiscuit
|
9de72881ab
|
[CI skip] Fixed some URLs
|
2020-08-07 00:31:09 +02:00 |
|
TheBusyBiscuit
|
d55a546c42
|
Fixes #2168
|
2020-08-06 16:24:41 +02:00 |
|
Vravinite
|
b0c040ea7a
|
Translate recipes_es.yml via GitLocalize
|
2020-08-06 07:47:06 +00:00 |
|
Luu7
|
4a45757a53
|
Translate messages_es.yml via GitLocalize
|
2020-08-06 07:47:03 +00:00 |
|
Luu7
|
33d802b940
|
Translate researches_es.yml via GitLocalize
|
2020-08-06 07:47:02 +00:00 |
|
TheBusyBiscuit
|
8d7d157503
|
Improved documentation
|
2020-08-06 00:54:49 +02:00 |
|
TheBusyBiscuit
|
ef01c85888
|
Some refactoring, requested changes
|
2020-08-06 00:30:33 +02:00 |
|
TheBusyBiscuit
|
dde0ab7de6
|
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544
Updated hungarian translations
|
2020-08-05 23:39:44 +02:00 |
|
TheBusyBiscuit
|
94843c79c0
|
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540
Update Japanese translation
|
2020-08-05 23:39:18 +02:00 |
|
TheBusyBiscuit
|
a032d151f1
|
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539
Updated TR localization
|
2020-08-05 23:38:52 +02:00 |
|
TheBusyBiscuit
|
e758be8d3c
|
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538
Tagalog/Filipino Translation Update
|
2020-08-05 23:38:28 +02:00 |
|
poma123
|
f89f3a35bb
|
Translate messages_hu.yml via GitLocalize
|
2020-08-05 21:36:36 +00:00 |
|
András Marczinkó
|
9594046bd5
|
Translate recipes_hu.yml via GitLocalize
|
2020-08-05 21:36:35 +00:00 |
|
TheBusyBiscuit
|
c2cc7ab96c
|
Translate messages_ja.yml via GitLocalize
|
2020-08-05 15:38:07 +00:00 |
|
LinoxGH
|
cd7a94516a
|
Translate messages_tr.yml via GitLocalize
|
2020-08-05 15:06:58 +00:00 |
|
Scott Gomez Andoy
|
a0fe200948
|
Translate messages_tl.yml via GitLocalize
|
2020-08-05 14:54:16 +00:00 |
|
TheBusyBiscuit
|
3d8e01e6f2
|
Translate messages_de.yml via GitLocalize
|
2020-08-05 14:52:33 +00:00 |
|
TheBusyBiscuit
|
46a01c368f
|
Merge pull request #2192 from poma123/fix/brewing
Fixed prevent Slimefun items from being added to a Brewing Stand
|
2020-08-05 16:49:54 +02:00 |
|
TheBusyBiscuit
|
32849ca563
|
Merge branch 'master' into refactoring/block-energy
|
2020-08-05 16:45:34 +02:00 |
|
TheBusyBiscuit
|
7c3599c862
|
[CI skip] Reduced technical debt
|
2020-08-05 16:44:43 +02:00 |
|
TheBusyBiscuit
|
c168497e79
|
[CI skip] Reduced technical debt
|
2020-08-05 13:31:35 +02:00 |
|
poma123
|
9454c890ea
|
Refactoring
|
2020-08-05 13:02:35 +02:00 |
|
poma123
|
6de4130d05
|
Fixed prevention when brewing with slimefun items
|
2020-08-05 12:41:48 +02:00 |
|
TheBusyBiscuit
|
f50d1d2faa
|
Big performance improvements to Enhanced Furnaces when using Paper
|
2020-08-04 20:15:21 +02:00 |
|
TheBusyBiscuit
|
c56ebe9c23
|
Merge branch 'master' into IcePick
|
2020-08-04 19:12:00 +02:00 |
|
TheBusyBiscuit
|
18036aa181
|
Added a new entry to SlimefunItems.java
|
2020-08-04 19:07:00 +02:00 |
|
TheBusyBiscuit
|
f8a988261f
|
Fixed typo
|
2020-08-04 19:03:20 +02:00 |
|
TheBusyBiscuit
|
3adb634d8b
|
Make it not override the vanilla item anymore
|
2020-08-04 19:02:53 +02:00 |
|
TheBusyBiscuit
|
f9e9a7c491
|
Updated research id to not break compatibility
|
2020-08-04 19:00:38 +02:00 |
|
TheBusyBiscuit
|
06f64725d9
|
Improved performance for idling Enhanced Furnaces on Paper
|
2020-08-04 18:00:31 +02:00 |
|
TheBusyBiscuit
|
9719058bbc
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-04 17:59:55 +02:00 |
|
TheBusyBiscuit
|
35684b60fc
|
Optimized performance for rainbow blocks
|
2020-08-04 17:59:41 +02:00 |
|
TheBusyBiscuit
|
d80fdac23b
|
Fixed debug fish
|
2020-08-04 15:49:58 +02:00 |
|
TheBusyBiscuit
|
b6ba6ce754
|
Updated all electric machines
|
2020-08-04 15:43:00 +02:00 |
|
Scott Gomez Andoy
|
927eefd63c
|
Translate recipes_tl.yml via GitLocalize
|
2020-08-04 12:46:42 +00:00 |
|
TheBusyBiscuit
|
bc387ee47a
|
Updated EnergyNet code
|
2020-08-04 13:50:22 +02:00 |
|
TheBusyBiscuit
|
368d2f5798
|
Move block energy code to EnergyNetComponent
|
2020-08-04 13:29:45 +02:00 |
|
TheBusyBiscuit
|
736b48a799
|
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525
Added korean as a language
|
2020-08-04 12:54:45 +02:00 |
|
TheBusyBiscuit
|
14f0b0f3fe
|
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523
Updated german translation
|
2020-08-04 12:54:20 +02:00 |
|
TheBusyBiscuit
|
8faf505999
|
Mark Korean as done
|
2020-08-04 12:50:48 +02:00 |
|
kwonms871
|
b41ef97859
|
Translate messages_ko.yml via GitLocalize
|
2020-08-04 10:48:38 +00:00 |
|
LinoxGH
|
bdde1d9745
|
Translate recipes_tr.yml via GitLocalize
|
2020-08-04 10:45:39 +00:00 |
|
TheBusyBiscuit
|
c2443a4df2
|
Translate recipes_de.yml via GitLocalize
|
2020-08-04 10:44:15 +00:00 |
|
TheBusyBiscuit
|
e870f82afd
|
Added piglin bartering to translation files
|
2020-08-04 12:40:08 +02:00 |
|
TheBusyBiscuit
|
8a9dfe25a8
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-08-04 12:30:30 +02:00 |
|
TheBusyBiscuit
|
dbed8b55d9
|
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub
Piglin drops fgithub
|
2020-08-04 12:25:26 +02:00 |
|
TheBusyBiscuit
|
0ff5fc7251
|
Small performance improvements for miner talismans
|
2020-08-04 10:19:24 +02:00 |
|
TheBusyBiscuit
|
eecdb61223
|
Fixed compilation
|
2020-08-04 09:53:50 +02:00 |
|
TheBusyBiscuit
|
04a71a2408
|
Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing
|
2020-08-04 09:52:59 +02:00 |
|
TheBusyBiscuit
|
7cc795f30e
|
One more change
|
2020-08-04 09:52:53 +02:00 |
|
TheBusyBiscuit
|
54aa45d1d2
|
Merge branch 'master' into cleanup/blockplacing
|
2020-08-04 09:47:51 +02:00 |
|
TheBusyBiscuit
|
484c7a22ec
|
Fixes #2180
|
2020-08-04 09:46:35 +02:00 |
|
TheBusyBiscuit
|
f409b869ae
|
Small performance optimization for bows
|
2020-08-04 09:46:04 +02:00 |
|
TheBusyBiscuit
|
137e91ad12
|
Fixes #2181
|
2020-08-04 01:16:20 +02:00 |
|
TheBusyBiscuit
|
8f289dcdbe
|
Fixes #2181
|
2020-08-04 01:15:14 +02:00 |
|
TheBusyBiscuit
|
56b78eac61
|
Fixes #2183
|
2020-08-04 00:58:43 +02:00 |
|
TheBusyBiscuit
|
cafa66b1a8
|
Fixes #2184
|
2020-08-04 00:48:23 +02:00 |
|
TheBusyBiscuit
|
012a0a7df9
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into cleanup/blockplacing
Conflicts:
CHANGELOG.md
|
2020-08-03 17:28:17 +02:00 |
|
TheBusyBiscuit
|
d8f5992282
|
Fixes #2103
|
2020-08-03 17:25:27 +02:00 |
|
TheBusyBiscuit
|
8d1e427409
|
A few more changes
|
2020-08-03 00:30:58 +02:00 |
|
dniym
|
17f84bcffd
|
Update PiglinBarterDrop.java
done
|
2020-08-02 17:44:57 -04:00 |
|
dniym
|
ecb3a354ff
|
Update PiglinBarterDrop.java
fixed
|
2020-08-02 17:44:11 -04:00 |
|
dniym
|
9287e1098d
|
Update PiglinListener.java
fixed
|
2020-08-02 17:43:26 -04:00 |
|
TheBusyBiscuit
|
1aeba31a96
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into cleanup/blockplacing
Conflicts:
CHANGELOG.md
|
2020-08-02 23:15:05 +02:00 |
|
dniym
|
21305ddfdb
|
Update PiglinListener.java
fixed a compile error
|
2020-08-02 16:37:19 -04:00 |
|
dniym
|
9edc082230
|
Update PiglinBarterDrop.java
|
2020-08-02 16:29:08 -04:00 |
|
dniym
|
c2376b90b3
|
Update PiglinListener.java
made requested changes.
|
2020-08-02 16:25:39 -04:00 |
|
Lleyton Gray
|
43838d7270
|
Applying suggestion
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
|
2020-08-02 13:07:55 -07:00 |
|
TheBusyBiscuit
|
1389085932
|
Fixed Reinforced Spawners
|
2020-08-02 22:01:32 +02:00 |
|
Lleyton Gray
|
3703aaa993
|
Add ItemSetting for toggling mining of Ancient Debris.
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
|
2020-08-02 12:52:16 -07:00 |
|
TheBusyBiscuit
|
d20650855c
|
Fixes #2179
|
2020-08-02 21:45:58 +02:00 |
|
TheBusyBiscuit
|
b26f2a1ca8
|
Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing
|
2020-08-02 21:37:03 +02:00 |
|
TheBusyBiscuit
|
a0b9579514
|
Added ToolUseHandler
|
2020-08-02 21:36:49 +02:00 |
|
lleyton
|
4c2b6bd1e7
|
Merge pull request #1 from TheBusyBiscuit/master
Sync Upstream with Fork
|
2020-08-02 12:18:47 -07:00 |
|
dniym
|
eed7b873c7
|
Update PiglinBarterDrop.java
made requested changes
|
2020-08-02 11:46:46 -04:00 |
|
dniym
|
8305729cfb
|
Update RandomMobDrop.java
made requested changes.
|
2020-08-02 11:45:19 -04:00 |
|
TheBusyBiscuit
|
6608c3c5d7
|
Merge branch 'master' into cleanup/blockplacing
|
2020-08-02 17:43:08 +02:00 |
|
TheBusyBiscuit
|
f32280a4ce
|
Fixes #2176
|
2020-08-02 17:39:09 +02:00 |
|
TheBusyBiscuit
|
6573a60016
|
Another commit full of cleanup stuff
|
2020-08-02 15:16:21 +02:00 |
|
TheBusyBiscuit
|
23d730cd7a
|
Some more refactoring
|
2020-08-02 14:04:24 +02:00 |
|
TheBusyBiscuit
|
bf65b310aa
|
Fixes #2147
|
2020-08-02 13:55:58 +02:00 |
|
TheBusyBiscuit
|
34b82d7a6f
|
Fixes #2164
|
2020-08-02 13:55:31 +02:00 |
|
kudansul
|
f3191658b8
|
Translate researches_ko.yml via GitLocalize
|
2020-08-02 11:46:07 +00:00 |
|
TheBusyBiscuit
|
e52d062ef5
|
Reduced technical debt and clutter
|
2020-08-02 11:22:00 +02:00 |
|
Lleyton Gray
|
fadb31feb1
|
Allow Ancient Debris to be mined by Industrial Miners
|
2020-08-01 20:47:43 -07:00 |
|
TheBusyBiscuit
|
0f924e485b
|
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482
Categories_it
|
2020-08-01 16:58:41 +02:00 |
|
TheBusyBiscuit
|
c8c3edb66c
|
[CI skip] Merge pull request #2157 from TheBusyBiscuit/gitlocalize-12480
Researches_it
|
2020-08-01 16:58:26 +02:00 |
|
TheBusyBiscuit
|
a472097798
|
Fixed androids rotating to the wrong side
|
2020-08-01 16:16:15 +02:00 |
|
TheBusyBiscuit
|
72a3f59d4b
|
Removed a deprecated method
|
2020-08-01 15:56:14 +02:00 |
|
TheBusyBiscuit
|
6580e82606
|
Removed deprecated things
|
2020-08-01 12:31:05 +02:00 |
|