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

129 commits

Author SHA1 Message Date
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge 
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
 2021-02-15 21:27:08 -08:00
simibubi
2700832dff Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 21:41:02 +01:00
simibubi
525fc03278 Demise of the hopper funnel 
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
 2021-01-22 20:43:59 +01:00
grimmauld
6af884edb7 Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 22:41:59 +01:00
simibubi
14154fe239 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-13 18:36:46 +01:00
simibubi
3336778052 version++ 2021-01-13 18:29:57 +01:00
grimmauld
07b33b66cc Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 16:34:45 +01:00
simibubi
db3a579b21 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-13 15:11:58 +01:00
simibubi
9d5ae97a0a Thank you weakref, very deterministic 
- Cart controller safety #669, #684, #702, #708, #709, #714, #719, #722, #725, #728
- Update Registrate #662, #677, #697, #726
- Fixed blocks not able to be placed onto a face with super glue
- Fixed block duplication involving super glue #681, #682
- Fixed fluid tanks voiding content on contrapion disassembly #707
 2021-01-13 14:16:45 +01:00
JozsefA
e5b61891fc update forge and setup mixins 2021-01-12 21:58:40 -08:00
simibubi
bf73a24401 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-04 14:15:53 +01:00
simibubi
788f92705d Why are we still here 
- Added chocolate and tea fluid tag #580
- Fixed item drain accepting stacks of items to empty
- Fixed basins mistakingly ignoring recipes with 4 or 9 equal ingredients
- Fixed schematicannon not able to place glass pipes, encased pipes, belt funnels and encased shafts
- Fixed race condition with other mods registering spawn eggs
- Belts no longer consume dye
- Tweaked placement constraints and control of cogwheels
- Chocolate and honey buckets can no longer stack
- Minecarts can now collide with non-mounted contraptions
- Attempted some optimizations to contraption lighting
 2020-12-27 23:09:19 +01: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
3e3b0dad6e port changes to 1.16 2020-10-10 22:40:59 +02:00
tterrag
4beaab9b97 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev 
Update to 1.16.3

Conflicts:
	src/main/java/com/simibubi/create/AllBlockPartials.java
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/AllTags.java
	src/main/java/com/simibubi/create/ClientEvents.java
	src/main/java/com/simibubi/create/CommonEvents.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankCTBehaviour.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
	src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java
	src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
	src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java
	src/main/java/com/simibubi/create/foundation/utility/AngleHelper.java
	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
	src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java
 2020-09-20 00:37:27 -04:00
tterrag
c1f68ab830 Prospective 1.16 port start - only find/replace fixes so far 2020-07-22 22:16:11 -04:00
simibubi
c58310b293 Actually playable 
- Fixed some left-over math bugs
- Greatly improved contraption-player collision response, especially with rotating structures
 2020-07-12 23:57:27 +02:00
LordGrimmauld
f9691da8c8 update forge to 31.2.31 2020-07-12 15:33:41 +02:00
simibubi
1ea7eeb040 Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-11 12:33:01 +02:00
simibubi
a13d9fcede CollideCarts 
- Contraptions now run their collision from a separate ticking hook
- Minecart mounted contraptions now run the collision algorithm
 2020-06-22 10:58:02 +02:00
LordGrimmauld
38dbed2518 Tagging Changes 
- Copper, Brass and Zinc blocks can now be used as beacon base block
- Copper, Brass and Zinc can now be used to activate a beacon
- Create ingots are now listed under the forge:ingots tag (not only forge:ingots/type)
- Create nuggets are now listed under the forge:nuggets tag (not only forge:nuggets/type)
- Create plates are now listed under the forge:plates tag (not only forge:plates/type)
- Updated registrate to support multiple tags
 2020-06-19 18:37:11 +02:00
simibubi
0a9816504b PumpState 
- Added blockstates, models and TE rendering for mechanical pumps
- Removed unused pipe textures
- Removed hasStaticPart in IWrenchable as it became obsolete in 1.15
- Bumped version
 2020-06-15 02:25:33 +02:00
simibubi
0c150ff86f Readying up 0.2.4d 
- Version bump
- Added changelog
 2020-06-14 00:14:06 +02:00
tterrag
144f46251f Fix changelog html output, add changelog history 2020-06-09 19:42:57 -04:00
simibubi
a8c994ec9f Hotfix the hotfix 
- Fixed build issues of auto-published jars
 2020-06-09 19:30:36 -04:00
simibubi
7e4e262f56 Version bump 2020-06-09 23:15:26 +02:00
simibubi
8cf8dbaf74 Version bump 2020-06-08 22:16:06 +02:00
tterrag
d857ebb3b7 Clean up buildscript, add automatic changelog and curseforge upload 2020-06-07 20:18:34 -04:00
simibubi
98f568f887 Addressing Todos 
- Started work on changing how moving constructs are assembled and ticked
 2019-10-13 21:30:25 +02:00