TheBusyBiscuit
|
29c568fdbf
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations
|
2021-04-27 16:34:58 +02:00 |
|
a
|
bf5ada4eab
|
Update ProgrammableAndroid.java
|
2021-04-27 09:34:52 -05:00 |
|
a
|
f79840bf66
|
changes
|
2021-04-27 09:26:56 -05:00 |
|
Riley
|
31ddf8e7de
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-04-26 18:55:24 -05:00 |
|
a
|
a1a6253961
|
Update ProgrammableAndroid.java
|
2021-04-26 18:43:10 -05:00 |
|
a
|
61ff68d34a
|
fix
|
2021-04-26 18:15:07 -05:00 |
|
TheBusyBiscuit
|
757d7613ac
|
[CI skip] Formatting
|
2021-04-26 18:06:25 +02:00 |
|
TheBusyBiscuit
|
71f3644078
|
[CI skip] Merge pull request #2991 from Slimefun/WalshyDev-patch-1
Update changelog per #2911
|
2021-04-26 15:46:00 +02:00 |
|
Daniel Walsh
|
46c7328603
|
Update changelog per #2911
|
2021-04-26 14:21:23 +01:00 |
|
Daniel Walsh
|
a8e84a7eff
|
Merge pull request #2911 from Rothes/master
Check lore to determine whether (Dis)Enchantable
|
2021-04-26 14:19:09 +01:00 |
|
Rothes
|
a59f5cb067
|
Update
|
2021-04-26 17:20:44 +08:00 |
|
TheBusyBiscuit
|
d55963d084
|
[CI skip] Updated README
|
2021-04-26 11:19:42 +02:00 |
|
TheBusyBiscuit
|
baeba0f52f
|
[CI skip] Updated README
|
2021-04-26 11:19:02 +02:00 |
|
TheBusyBiscuit
|
658d101706
|
[CI skip] Updated README
|
2021-04-26 11:13:37 +02:00 |
|
Rothes
|
ff58e53145
|
Update
|
2021-04-26 15:17:39 +08:00 |
|
Rothes
|
205f8d02b1
|
Merge branch 'master' into master
|
2021-04-26 12:28:03 +08:00 |
|
TheBusyBiscuit
|
f048d0276b
|
Merge pull request #2982 from martinbrom/fix/auto-enchanter-fixed-order
Fixes #2977
|
2021-04-25 20:13:59 +02:00 |
|
TheBusyBiscuit
|
a7835197a5
|
Some minor code improvements
|
2021-04-25 20:13:51 +02:00 |
|
TheBusyBiscuit
|
d91d9c2856
|
Removed Automated Crafting Chamber
|
2021-04-25 19:49:17 +02:00 |
|
TheBusyBiscuit
|
bffef56407
|
Added Category#setTier()
|
2021-04-25 19:47:58 +02:00 |
|
TheBusyBiscuit
|
c975fe234e
|
Fixed #2989
|
2021-04-25 19:29:57 +02:00 |
|
TheBusyBiscuit
|
8dce87cca0
|
[CI skip] Updated changelog
|
2021-04-24 13:40:19 +02:00 |
|
Daniel Walsh
|
2f27ddc6a6
|
Merge pull request #2988 from martinbrom/fix/talisman-of-the-anvil
Fixes NPE when hand is empty while talisman of the anvil triggers
|
2021-04-24 12:22:59 +01:00 |
|
TheBusyBiscuit
|
3fe7752e28
|
[CI skip] Merge pull request #2986 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.3
|
2021-04-24 12:47:16 +02:00 |
|
Martin Brom
|
a6f3696719
|
Fixes NPE when hand is empty while talisman of the anvil triggers
Resolves #2987
|
2021-04-24 12:22:40 +02:00 |
|
Renovate Bot
|
f7e5aa33b3
|
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.3
|
2021-04-23 22:01:22 +00:00 |
|
TheBusyBiscuit
|
d0a7ad7aea
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-04-23 20:48:29 +02:00 |
|
TheBusyBiscuit
|
1c5372d261
|
Complete restructure of language files
|
2021-04-23 20:48:24 +02:00 |
|
TheBusyBiscuit
|
fb4c9a2a40
|
[CI skip] Merge pull request #2984 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.196
|
2021-04-23 20:45:31 +02:00 |
|
Renovate Bot
|
e323903a36
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.196
|
2021-04-23 18:39:42 +00:00 |
|
TheBusyBiscuit
|
3ad981aa1e
|
Fixed shading of libraries
|
2021-04-23 19:29:01 +02:00 |
|
TheBusyBiscuit
|
1982ec0aeb
|
Reorganized language files
|
2021-04-23 19:22:25 +02:00 |
|
TheBusyBiscuit
|
34421d4a12
|
More refactoring
|
2021-04-23 19:01:41 +02:00 |
|
TheBusyBiscuit
|
a3a9ee4b90
|
Various code improvements
|
2021-04-23 18:58:35 +02:00 |
|
TheBusyBiscuit
|
8aeda66c5e
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
|
2021-04-23 18:30:12 +02:00 |
|
TheBusyBiscuit
|
f017088f42
|
[CI skip] Small docs changes
|
2021-04-23 18:29:55 +02:00 |
|
Martin Brom
|
a94926dfaf
|
Small Auto-Enchanter cleanup
|
2021-04-23 17:12:26 +02:00 |
|
Martin Brom
|
cfb9f53057
|
Auto-Enchanter now checks both combinations of book and item in its inventory
Fixes #2977
|
2021-04-23 17:03:02 +02:00 |
|
TheBusyBiscuit
|
3da276f982
|
[CI skip] Yeah that didn't work out well...
|
2021-04-23 16:07:45 +02:00 |
|
TheBusyBiscuit
|
fed7d0ee43
|
Update Crowdin configuration file
|
2021-04-23 16:02:34 +02:00 |
|
Rothes
|
31a571455c
|
Update AbstractEnchantmentMachine.java
|
2021-04-23 20:08:40 +08:00 |
|
Rothes
|
67c0947dc8
|
Added toggle setting and some edit.
|
2021-04-23 20:04:00 +08:00 |
|
TheBusyBiscuit
|
02ba30c226
|
Updated changelog to include new features
Tier 2 Auto-Enchanter, Tier 2 Auto-Disenchanter
|
2021-04-23 13:51:42 +02:00 |
|
Daniel Walsh
|
b0f2fc8c4d
|
Merge pull request #2967 from variananora/add-suggestion-311
|
2021-04-23 12:50:41 +01:00 |
|
TheBusyBiscuit
|
c2ec4693ac
|
Merge pull request #2963 from martinbrom/feature/coalblock-carbon
Add Block of Coal -> Carbon recipe to the Carbon Press and Compressor
|
2021-04-23 13:46:22 +02:00 |
|
TheBusyBiscuit
|
a18a095722
|
[CI skip] Updated changelog
|
2021-04-23 13:46:16 +02:00 |
|
TheBusyBiscuit
|
9733dcf93a
|
[CI skip] Merge pull request #2980 from Slimefun/renovate/ibiqlik-action-yamllint-3.x
Update ibiqlik/action-yamllint action to v3.0.1
|
2021-04-23 13:34:52 +02:00 |
|
BuildTools
|
a846d4ea1b
|
Re-added check null and empty.
|
2021-04-23 19:29:36 +08:00 |
|
Renovate Bot
|
e7f7e67530
|
Update ibiqlik/action-yamllint action to v3.0.1
|
2021-04-23 11:14:03 +00:00 |
|
Varian Anora
|
45d6c376af
|
Update researches_en.yml
|
2021-04-22 20:14:52 +07:00 |
|