Jozufozu
3aeef5d0ff
The sounds of sand
2021-11-17 19:42:34 -08:00
PepperBell
e0b496f807
Chipped away
2021-11-06 20:59:58 -07:00
PepperBell
3611068e00
Switch to Parchment mappings
2021-11-02 19:30:02 -07:00
PepperBell
0cb7a0260e
Chipping away
2021-11-01 22:18:30 -07:00
simibubi
741fa401d8
Move to official class names
...
- also updated buildscript to 1.17
- some remap corruption from compilation errors in flw/next
2021-11-02 00:08:20 +01:00
simibubi
925c98792f
(Sp)out of order
...
- Added behavioural registry for Spout/Block interaction
- Fixed and Refactored TiCon Casting via Spout
- Fixed fluid pipes getting stuck trying to waterlog non-solid blocks with fluid handling capabilities
- Fixed modlist lookup for non-english locales
2021-08-25 13:46:53 +02:00
Jozufozu
0349d57929
Fix CI
...
- Javadoc doesn't like angle brackets
- Add jar to artifacts
2021-08-06 12:13:51 -07:00
Jozufozu
e7c7669d7f
Setup build script for maven
2021-08-05 15:09:00 -07:00
simibubi
05d581c779
Blinding transparency
...
- Fixed goggle overlay fading into a solid colour when its custom alpha is 0
- Fixed crash rendering saws, addresses #2064
2021-07-31 12:24:28 +02:00
grimmauld
5610f63375
no more outdated gradle
2021-07-15 11:53:08 +02:00
grimmauld
a048285699
Bulk remap, compiles
2021-07-15 11:32:03 +02:00
grimmauld
f4d73118b1
merge more of the new stuff
2021-07-06 10:05:26 +02:00
grimmauld
f4b16852af
Merge all the new stuff
2021-06-26 19:24:59 +02:00
grimmauld
9763631984
Fix up the dynamic trees
2021-06-26 19:13:44 +02:00
PepperBell
c9f9be73ff
Buildscript tweaks
...
- Move Flywheel version to gradle.properties
- Use implementation instead of compile
2021-06-23 12:30:10 -07:00
JozsefA
c9d95e83ae
Bump flywheel build
2021-06-23 09:13:31 -07:00
JozsefA
dd63c6c4e3
Cleanup and get ready to merge
2021-06-22 21:09:32 -07:00
JozsefA
aeff644cc3
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/generated/resources/assets/create/lang/en_us.json
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.json
# src/generated/resources/assets/create/lang/unfinished/es_mx.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pl_pl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
# src/generated/resources/assets/create/lang/unfinished/zh_tw.json
# src/main/java/com/simibubi/create/AllContainerTypes.java
# src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java
# src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java
# src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java
# src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java
# src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java
# src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java
# src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/FilterContainer.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
# src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
# src/main/java/com/simibubi/create/foundation/gui/mainMenu/CreateMainMenuScreen.java
# src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java
# src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
# src/main/resources/META-INF/mods.toml
# src/main/resources/assets/create/lang/default/messages.json
# src/main/resources/assets/create/lang/default/tooltips.json
2021-06-19 16:11:18 -07:00
JozsefA
652111c233
Yeet
2021-06-19 00:29:18 -07:00
PepperBell
1e41a390e4
Update buildscript
...
- Update Gradle from 5.6.3 to 5.6.4
- Move some versions to gradle.properties
- Switch to new Forge Maven URL
- Update JEI to 1.16.5 and Mixin processor to 0.8.2
- Add out/ to .gitignore
2021-06-17 22:04:21 -07:00
PepperBell
9235aa93ba
JEI Fixes
...
- Fix #1661 : blasting-only recipes would not be shown under the bulk blasting category
- Add ability to remove matching recipes by type while using the category builder
- Fix fan catalyst items being italicized
- Add and tweak some visibility modifiers
2021-05-28 23:10:12 -07:00
grimmauld
7ae89ef4e3
Dynamic trees compat (WIP)
2021-05-20 08:31:35 +02:00
Eivind
a2903182b0
Bumping registrate version to fix incompatibility with mojmap mods
2021-05-19 12:20:53 +02:00
JozsefA
2db49997df
Clean up build.gradle
2021-04-09 16:23:49 -07:00
JozsefA
cbb7e48565
Revert "Don't crash with starlight"
...
This reverts commit 4ae1ce3d
2021-04-09 16:21:38 -07:00
JozsefA
4ae1ce3dbe
Don't crash with starlight
2021-04-05 23:23:35 -07:00
zelophed
d03ea3488a
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/blockstates/andesite_funnel.json
# src/generated/resources/assets/create/blockstates/brass_funnel.json
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
# src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
# src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java
# src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
# src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
# src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java
# src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java
# src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
# src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
# src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java
# src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
# src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java
# src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java
# src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
# src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
# src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java
# src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
# src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java
# src/main/java/com/simibubi/create/foundation/utility/Lang.java
# src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java
# src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java
# src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
2021-03-20 12:58:02 +01:00
simibubi
21d87a0cfe
Change mixin repo
2021-03-08 17:29:42 +01:00
JozsefA
36e81857a3
Unmeddle the build script, but profiling is good.
2021-02-24 16:57:26 -08:00
JozsefA
e62d89b21c
Everything is lit, hopefully all the time now.
2021-02-24 16:52:49 -08:00
grimmauld
31e3c5b0bd
Port recent changes
2021-02-20 17:27:51 +01:00
simibubi
4ee9dd8a8a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-19 00:49:39 +01:00
grimmauld
8c8a9abd8a
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/assets/create/blockstates/fluid_pipe.json
2021-02-18 22:32:45 +01:00
JozsefA
2aa06b0786
useful debug arg in build.gradle
2021-02-05 22:50:07 -08:00
grimmauld
3d2edc492b
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-05 21:36:10 +01:00
simibubi
667f27d9b7
Update build.gradle
...
- Oops, messed with the buildscript again
2021-01-22 20:57:48 +01:00
grimmauld
fbb1c6b221
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
2021-01-22 20:56:46 +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
28cd9a1fe1
Druidcraft woodcutter compatibility
2021-01-20 22:36:04 +01:00
JozsefA
0cb18c532d
uncomment the mixin annotation processor whoops
2021-01-15 20:07:04 -08:00
JozsefA
37e64e4c1d
fix vertex attribute data types
...
blockcolors and ao now work in contraptions
be smarter about allocating buffers
use gl buffer mapping, more to come
2021-01-15 16:17:13 -08:00
grimmauld
2b615b68bd
Fix mixins outside dev env
2021-01-13 09:50:00 +01:00
JozsefA
e5b61891fc
update forge and setup mixins
2021-01-12 21:58:40 -08:00
simibubi
069d5c962d
Revert temporary changes to build.gradle
2021-01-03 22:33:07 +01:00
simibubi
1498cb1cfc
Why are we still here, Part IV
...
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
grimmauld
34bfa2f479
Remove TiC run reference
2020-10-16 17:00:43 +02:00
grimmauld
c9e2f8b05e
Deforester works on slime saplings
2020-10-16 11:14:47 +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
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
