Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-13 13:32:24 +01:00
Code Issues Projects Releases Packages Wiki Activity
903 commits 31 branches 14 tags 108 MiB
Commit graph

903 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
simibubi
9852d84fb8 More logistical errands 
- Arms can no longer feed random junk to a jukebox
- Arms are no longer oblivious to hot-swapped blocks in its target areas
- Arms can now directly extract from and insert to Deployers and Crafters
- Arms can now feed blaze burners
- Fixed brass funnels deleting items inserted into a full or stalled inventory
- Fixed brass funnels in hopper mode not showing amounts on filters when transferring between server-only inventories
- Arms & Deployers can now be paused using a redstone signal; stopping them after their next completed cycle
- Fixed zapper tools not applying changes when the screen is closed using the confirm button
- Reorganized valve handle registration
- Added more preliminary recipes
 2020-10-12 16:03:26 +02:00
woow101
cbd59871cc
Update advancements.json 
Fixed an error in the edit.
 2020-10-12 03:12:19 -05:00
woow101
895131ad72
Update advancements.json 
Edits to several advancement titles and descriptions for errors and consistency.
 2020-10-12 02:28:28 -05:00
grimmauld
0f2ecfd45e merge nixie tubes to 1.16 2020-10-11 19:14:37 +02:00
simibubi
1b84bbf16f Custom Nixies 
- Rows of nixie tubes will now display text from a name tag used on them
- Nixie tubes will dynamically update score/selector/nbt components in the displayed text
 2020-10-11 17:50:48 +02:00
grimmauld
83918a6aaf Fix build issues by not relying on modmaven, update JEI dependency to use dedicated 1.16.3 files 2020-10-11 15:43:04 +02:00
grimmauld
131669c9ff Temporarily fix fluid tag serialization 2020-10-11 12:38:50 +02:00
grimmauld
3e3b0dad6e port changes to 1.16 2020-10-10 22:40:59 +02:00
grimmauld
1a4814e724 merge mc1.15/dev into mc1.16/dev 2020-10-10 21:46:40 +02:00
simibubi
22ed233969 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-10 21:15:48 +02:00
simibubi
f3deb8ba85 Tilted Trains 
- The collision response now (semi)-supports yaw-pitch combined rotations of contraptions
- Attempted collision and rendering of contraption couplings moving up and downhill
- Fixed sychronization issues of a mounted contraptions' initial orientation
- Contraption couplings no longer render the virtual coupling connection
- Entities can no longer mount the cart connected by another carts' contraption
- Contraption coupligs no longer rotate backwards when opposite couplings are added onto it
- Minecarts no longer deadlock each other when one of them had stalled due to an unloaded coupling end
- Cart assemblers only disassemble coupling contraptions if both carts are within an inactive cart assembler
- Fixed interactions between coupling contraptions and furnace/chest minecart invs
 2020-10-10 21:12:28 +02:00
grimmauld
88b8e7744f Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java
 2020-10-10 19:48:06 +02:00
grimmauld
474d21de9a clean up some unused imports 2020-10-10 18:23:56 +02:00
grimmauld
850297f777 Switch valve handles back to crank shapes as those fit better to the new model 2020-10-10 18:16:28 +02:00
grimmauld
cb135df649 Configurable hunger games 2020-10-10 18:13:40 +02:00
grimmauld
9bff016ba4 Depot comparing 2020-10-10 17:54:17 +02:00
grimmauld
299663295c fixes now for 1.16.3 2020-10-10 10:26:54 +02:00
grimmauld
f593aca95d fix build issues 2020-10-09 20:36:40 +02:00