mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
6,516 Commits 1 Branch 0 Tags 64 MiB
61ff68d34a
Commit Graph

3559 Commits

Author SHA1 Message Date
a
61ff68d34a fix 2021-04-26 18:15:07 -05:00
TheBusyBiscuit
757d7613ac [CI skip] Formatting 2021-04-26 18:06:25 +02:00
Rothes
a59f5cb067 Update 2021-04-26 17:20:44 +08: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
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
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
TheBusyBiscuit
1c5372d261 Complete restructure of language files 2021-04-23 20:48:24 +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
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
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
BuildTools
a846d4ea1b Re-added check null and empty. 2021-04-23 19:29:36 +08:00
Varian Anora
45d6c376af Update researches_en.yml 2021-04-22 20:14:52 +07:00
Varian Anora
23d4aad256 Merge branch 'master' into add-suggestion-311 2021-04-22 20:12:47 +07:00
Daniel Walsh
9e5162179f
[CI Skip] Merge pull request #2970 from IAmSorryArt/protected 2021-04-22 11:03:03 +01:00
Rothes
07167442f9
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-04-22 17:33:27 +08:00
Varian Anora
6840efe2f1 Changed Auto Disenchanter recipe and added new research for tier two enchanters. 
Changed Auto Disenchanter Recipe to:
```
Auto Disenchanter II
Speed: 3x
Power: 48J/s
Buffer: 1024J

Recipe:
| A | B | A |
| C | D | C |
| E | E | E |

A = Reinforced Plate
B = Anvil
C = Blistering Ingot (100%)
D = Auto Disenchanter
E = Wither Proof Obsidian
F = Big Capacitor```
Changed wither proof obsidian with big capacitor for the buffer size.

Added new research for tier two enchanters with 48 exp levels on ID 277.
 2021-04-22 12:30:58 +07:00
Rothes
16a5a2ce06 Update 2021-04-22 11:58:52 +08:00
Varian Anora
9dec7b710d Merge branch 'master' into add-suggestion-311 2021-04-22 10:39:45 +07:00
BuildTools
76f5848e08 Use ItemName in default value instead of Identifier 2021-04-21 22:34:17 +08:00
Rothes
ecb23fa5e5 Update 2021-04-21 18:02:14 +08:00
BuildTools
27bbca1502 Update 2021-04-21 13:06:16 +08:00
BuildTools
8eb196caaa a 2021-04-21 12:58:30 +08:00
TheBusyBiscuit
c0058a3994 [CI skip] Refactored and cleaned up Auto (Dis)enchanters 2021-04-20 17:35:51 +02:00
Varian Anora
2803fbe61e Merge branch 'master' into add-suggestion-311 2021-04-20 19:00:37 +07:00
IAmSorry
a16e1f6efc
Fixed the wrong protected :) 2021-04-19 22:30:07 +02:00
TheBusyBiscuit
0fbb9b2d9b [CI skip] 200+ contributors, we need a third page 👀 2021-04-19 20:15:56 +02:00
IAmSorry
04b901928c
Change visibility to protected 19 2021-04-19 17:30:12 +02:00
IAmSorry
357898fe8e
Change visibility to protected 18 2021-04-19 17:28:47 +02:00
IAmSorry
cc39df17ac
Change visibility to protected 17 2021-04-19 17:26:34 +02:00
IAmSorry
86e73631c7
Change visibility to protected 16 2021-04-19 17:25:09 +02:00
IAmSorry
ce86abca47
Change visibility to protected 15 2021-04-19 17:23:40 +02:00
IAmSorry
6d36b43ced
Change visibility to protected 14 2021-04-19 17:22:31 +02:00
IAmSorry
ecda25819b
Change visibility to protected 13 2021-04-19 17:21:07 +02:00
IAmSorry
b0a8ab55b9
Change visibility to protected 12 2021-04-19 17:20:13 +02:00
IAmSorry
a0b559330d
Change visibility to protected 11 2021-04-19 17:19:11 +02:00
IAmSorry
848725c42b
Change visibility to protected 10 2021-04-19 17:18:02 +02:00