Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 21:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity
971 commits 31 branches 14 tags 108 MiB
Commit graph

971 commits

This branch
This branch
All branches
Author SHA1 Message Date
simibubi
cfda2c624d
Merge pull request #487 from wchen1990/mc1.16/dev 
Merge mc1.15/dev (a81a411) to mc1.16/dev
 2020-10-18 14:53:13 +02:00
Bob Dole
21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev 
- Resolved merge conflicts
 2020-10-18 00:22:25 -04:00
Kryppers
a81a4110d4 Tools: the Tippening. 
Fixed an error in my previous commit.

Introduced basic Tooltips for fluid items.

I've left the smart pipe entries as placeholder as I've not tried them out yet.
 2020-10-18 00:10:10 +01:00
Kryppers
2cba50c9ab Tool-Tip of the Iceberg 
Couple of additional bits of information and some adjustments.

Tooltip added for white_seat. Needs to be added to the other seat colours.
 2020-10-17 20:57:14 +01:00
simibubi
dd95096bfa Smart Fluid Pipes 
- Added craftable pipes with filtering capabilities
- Added missing recipe for the Portable Storage Interface
 2020-10-17 18:20:05 +02:00
Zelophed
bbe7ef820d Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-17 17:33:54 +02:00
Zelophed
7ef31b9053 Spooky Filters 
- allow our filters to be populated from JEIs ghost-ingredients
 2020-10-17 17:32:37 +02:00
Colman Davenport
083a9c1140 Refactor FluidContentsAttribute 2020-10-17 11:24:15 -04:00
Colman Davenport
42ef3796a2 Refactor EnchantAttribute 2020-10-17 11:23:38 -04:00
Colman Davenport
6d51a6c730 Astral Sorcery Attributes 2020-10-17 01:25:29 -04:00
Colman Davenport
822ca6dad6 Lang 2020-10-17 01:17:25 -04:00
Colman Davenport
562abdea31 Written Book Attributes 2020-10-17 01:16:32 -04:00
Colman Davenport
c1bb1e64c9 Custom Name Attributes 2020-10-17 00:58:49 -04:00
Colman Davenport
6ff57ca65c Fluid Container Attributes 2020-10-17 00:26:16 -04:00
Colman Davenport
a7e2d842af Specific Enchantment Attribute 2020-10-17 00:04:23 -04:00
Zelophed
49ed619a79 ForgeCraft Playtesting, Part III-b 
- fix blockzapper upgrade category
- fix goggle item not displaying properly in the goggle-overlay and its config screen
- fix items in guis occluding certain tooltips (again)
 2020-10-17 04:29:00 +02:00
Zelophed
f499122ae5 Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
 2020-10-17 04:21:50 +02:00
Zelophed
d585fc0e21 ForgeCraft Playtesting, Part III-a 
- fix chromatic compound needing line of sight to the sky to convert even when the beacon is active
 2020-10-17 04:15:51 +02:00
Zelophed
b5930df58a merge changes from 1.15 2020-10-16 19:19:55 +02:00
Zelophed
b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
 2020-10-16 19:11:29 +02:00
Zelophed
a2e4cfb66d fixup! Split mixing and mechanical crafting categories 2020-10-16 18:58:35 +02:00
Zelophed
022bcdd620 Split mixing and mechanical crafting categories 
- also fix a null-crash in ArmTileEntity
 2020-10-16 18:57:21 +02:00
grimmauld
34bfa2f479 Remove TiC run reference 2020-10-16 17:00:43 +02:00
grimmauld
c44d80ac82 TiC casting table(basin compat 2020-10-16 15:32:58 +02:00
grimmauld
a440ab6772 Make tree fertilizer work on slime saplings 2020-10-16 12:18:14 +02:00
grimmauld
893294b9e4 make the saw work 2020-10-16 11:37:28 +02:00
grimmauld
c9e2f8b05e Deforester works on slime saplings 2020-10-16 11:14:47 +02:00
simibubi
db2b8dd197 ForgeCraft Playtesting, Part II 
- Fixed server dist crash in entity belt movement
- Fixed client crash when saving a schematic without giving it a name
 2020-10-14 21:15:19 +02:00
simibubi
69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-14 21:06:46 +02:00
simibubi
dcd0598e16 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-14 20:52:40 +02:00
simibubi
62434fd564 That's hot 
- Better JEI documentation of heat levels
- Remapped / Adjusted a few tooltips
- Fixed fan processing on item entities happening on both logical sides
 2020-10-14 20:52:38 +02:00
grimmauld
277e4ea9d1 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2020-10-14 16:37:27 +02:00
grimmauld
6200329e43 Fix botania petal milling 2020-10-14 16:36:53 +02:00
grimmauld
31baac3c8c Not Enough Bugs 
- fixed last blaze burner of a stack disappearing when clicking a blaze entity
- remove dead code from the valve handle class
 2020-10-14 16:13:09 +02:00
Kryppers
40c4059b75 Tooltips? more like Cool-tips! 
Fixed a couple of spelling errors.
Added a bunch of Tooltips.
 2020-10-13 23:59:02 +01:00
simibubi
f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-13 20:57:30 +02:00
simibubi
d973e9bcdd JEI fixes 
- Fluids in JEI now display the exact amount required
- Fixed short background of custom compacting JEI
- Fixed localization of sawing recipe category
- Fixed blocks waterlogged by a pump not scheduling a fluid update
 2020-10-13 20:39:44 +02:00
simibubi
9b5707cba6 ForgeCraft Playtesting, Part I 
- Fixed various rendering in JEI and UIs
- Fixed oxidized blocks not allowing to be harvested
- Fixed missing titles and tooltips in JEI and other UIs
 2020-10-13 19:56:12 +02:00
Colman Davenport
677363f1b8 Update rendering 2020-10-13 00:10:23 -04:00
Colman Davenport
b89710237d Saws check actual verticality in contraptions 2020-10-12 23:25:35 -04:00
Colman Davenport
5342beacaf Conditional moving saw operation 
- Saws are inactive while moving backwards
- Vertical moving saws can now damage entities
 2020-10-12 23:25:35 -04:00
Colman Davenport
a28b6bbdc3 Overhaul mechanical saw rendering 
- Saws no longer use "RUNNING" blockstate
- Sawblade animates based on input speed
- Saws properly stop animating when inactive
 2020-10-12 23:25:35 -04:00
simibubi
442d89e09e Port Changes to 1.16, Fix server launch 2020-10-12 22:16:06 +02:00
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02:00
simibubi
5966040d12 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 21:59:30 +02:00
simibubi
afa94c3e77 Blazier updates 
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
 2020-10-12 21:55:09 +02:00
simibubi
be8924a154 Port changes to 1.16 2020-10-12 16:25:57 +02:00
simibubi
df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 16:25:46 +02:00
simibubi
56f5ca45e3
Merge pull request #456 from gamrguy/kelp-harvester 
Allow harvesters to harvest kelp tops
 2020-10-12 16:09:40 +02:00
simibubi
dbf4e50bb4
Merge pull request #483 from woow101/mc1.15/dev 
Update advancements.json
 2020-10-12 16:05:17 +02:00