simibubi
8a4eaef015
Fix tooltip whitespace
2021-03-30 18:56:22 +02:00
simibubi
c2f3ebbf72
Fix Tooltips on 1.16
2021-03-30 16:32:19 +02:00
90b9a3aff9
Merge & Port
2021-03-29 10:57:50 +02:00
simibubi
5299204fb5
Better Tooltip Integration
...
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02: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
Snownee
0ca388141c
Better line breaking
2021-03-15 13:00:55 +08:00
31e3c5b0bd
Port recent changes
2021-02-20 17:27:51 +01:00
Snownee
5e14ca71d9
Add max stack size check to ItemHelper.extract
2021-02-14 11:51:31 +08:00
Snownee
5d0674067f
Fix TooltipHelper formatting
2021-01-14 11:52:48 +08:00
simibubi
bf73a24401
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-01-04 14:15:53 +01:00
Snownee
e554c5a3ff
Solution to #571
2020-12-25 16:06:32 +08:00
simibubi
4c91397fbb
Tooltip fix
...
- Cleared more remnants of the broken text component transition
2020-12-17 12:35:23 +01:00
simibubi
78036195ab
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-13 15:33:45 +01:00
simibubi
d68d702b3a
Fun with Recipes
...
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
simibubi
42215b8eb0
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-11 21:23:31 +01:00
Snownee
77e9a75877
Use cached directions
2020-12-10 09:36:59 +08:00
4de7c118f4
merge and port. I WANT IT NOOOOW!
2020-12-05 11:42:14 +01:00
simibubi
9e4b92babf
Other options are available
...
- Added a handful of crushed ore compatibility (+spicy datagen)
- Lapis sheets are now tagged
2020-12-04 18:10:07 +01:00
tterrag
696393ec41
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/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
# src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
# src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java
# src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
# src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
2020-11-28 17:24:30 -05:00
simibubi
bbe0914b2f
SU to confuse you
...
- Reworked some of the tooltips presented by kinetic components
2020-11-27 13:31:55 +01:00
a2e28db761
Actually fix tooltips on 1.16
2020-11-17 22:20:00 +01:00
20d1403ede
Fix getUnformattedDeepText breaking with translation text components, which resulted in double tooltip text
2020-11-17 14:58:48 +01:00
a00f619017
porty porty all the PRs
2020-11-15 10:41:05 +01:00
9ea09aef4c
merge recent progress to 1.16
2020-11-14 15:22:32 +01:00
Snownee
c730517fb4
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/snownee
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/blockstates/fluid_pipe.json
2020-11-12 08:03:24 +08:00
simibubi
675af419ce
Fixing user errors
...
- Added hints when looking at
- Mechanical arms with no targets
- Funnels attempted to be used like 0.2 transposers
- Bearings that require an update to attach to their blocks
- Added some additional feedback when players apply filters
- Spouts now place two blocks above a depot/belt when used
- Basins can no longer be placed directly under a press or mixer
- Fixed prismarine recipe cycles from various mod interactions
2020-11-11 23:59:40 +01:00
Snownee
2e3100be9a
Fix JEI ingredients getting merged incorrectly
2020-11-08 20:53:12 +08:00
521ce8a766
port recent changes
2020-10-23 19:01:25 +02:00
simibubi
b2cd378b52
Back in the early game
...
- Hand cranks can now be made without the need of brass
- Fixed tooltip referrals
- Crafters can no longer be covered when while they are holding an item
- Pushed some numbers around
2020-10-22 01:48:24 +02:00
simibubi
b14664d45f
Windmill is Bearing is Clockwork
...
- Fixed Mechanical Press animation de-sync between server and client
- The press no longer requires a redstone signal to activate on in-world items
- Fixed spouts and basin trying to create potion buckets
- The Mechanical bearing can no longer generate force from wind
- Added the windmill bearing
- Windmill bearings can be configured to rotate counter-clockwise
- Added Sail Frames and Sails
- Sails can by dyed in-world
- Sails negate fall damage
- Sails attach themselves to blocks and do not require a sticky surface or chassis
- Clockwork bearings can now be configured to switch minute and hour hand aswell as use a 24 hour cycle
- Fixed tunnels with windows occluding block faces directly behind them
- Fixed item model of the mechanical saw
2020-10-22 00:50:17 +02:00
simibubi
12e5b95157
Yet more TextComponent nonsense
...
1.16 just keeps on giving
2020-10-20 21:03:43 +02:00
simibubi
41148a5e39
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-10-20 21:02:50 +02:00
simibubi
df252b3e30
Catching up
...
- remapped seat tooltips
- remapped outdated lang keys
- applied changes of #395 to 1.15
- Fixed Schematic hotbar overlay sometimes drawing on top of the item icon
- Fixed mechanical arm lighting and render bounds issues
2020-10-20 13:42:16 +02:00
simibubi
69cbfff8ed
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-10-14 21:06:46 +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
simibubi
442d89e09e
Port Changes to 1.16, Fix server launch
2020-10-12 22:16:06 +02:00
simibubi
df5008e7fd
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-10-12 16:25:46 +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
b9476b58ce
bare basin business, but 1.16
2020-10-06 21:42:31 +02:00
simibubi
378164b8b9
More unfinished basin business
...
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
5401d96942
Fixed item tooltips
2020-10-06 20:11:58 +02:00
e8c458f2ad
Fix even more text components, now in tooltips
2020-10-06 15:54:16 +02:00
simibubi
bc4418a929
Port recent changes to compile
2020-10-04 01:59:51 +02:00
31e35d060f
fixed merge conflicts
2020-10-04 01:08:13 +02:00
simibubi
5c56adaeaa
Midnight bugs
...
- Fixed deployers not firing any right-click actions
- Fixed basin renderer crashing outside of dev env
- Fixed some lighting and flickering on psis
2020-09-26 00:59:43 +02:00
simibubi
27b05bc43e
Portable Storage Interface remaster
...
- Implemented new PSI models by Kryppers
- PSIs are now used in pairs like contacts
- PSIs now act as an inventory proxy of the attached contraption
- Comparators can detect when two PSIs are interfacing
- Contraptions will continue moving after a second of inactivity
2020-09-24 20:32:16 +02:00
ae7a24d2a3
Below 3 digit compile errors, finally
2020-09-23 21:42:31 +02:00
5538441e9f
Still 3 digit compile errors? Fixed a bunch, probably broke a bit too
2020-09-23 11:15:32 +02:00
2f2a5674f3
Ok, still above 100 compile errors, but progress...
2020-09-22 23:18:13 +02:00
a142cfdb85
Last porty for the day
2020-09-22 22:28:51 +02:00
