mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-15 23:14:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,149 Commits 31 Branches 14 Tags 106 MiB
63bd4258e1
Commit Graph

2022 Commits

Author SHA1 Message Date
Jozsef
de339819d5 Wrench-stone 
- Wrenches can pick up redstone components
 - This behavior is controlled by the block tag #create:wrench_pickup
 2021-07-04 00:42:10 -07:00
simibubi
8fd4664ed8 Ploughing bubbles 
- Fixed Mechanical Plough breaking segments of a bubble column
 2021-07-03 16:38:51 +02:00
simibubi
1b5f9e7944 Picking up Controller Rails 
- Controller Rails can now be picked up using a Wrench
 2021-07-03 16:30:37 +02:00
simibubi
b2ff3a465f Advancing via Potato 
- Added an advancement for the potato cannon
- Fixed the clockwork advancement
- Fixed the press advancement not firing when used with depot
 2021-07-03 16:09:07 +02:00
simibubi
8a598a699b Ender Chutes are real 
- Fixed chutes directly between two inventories transferring items instantly
- Fixed jittering visuals of the clientside chute item near containers
- Rail blocks can now be picked up with a wrench
 2021-07-03 15:37:07 +02:00
PepperBell
7264d838a0 Remove another unnecessary override 
- Remove shouldCloseOnEsc override from AbstractSimiContainerScreen
 2021-07-03 01:15:34 -07:00
PepperCode1
215262bbe5
Merge pull request #1873 from macbrayne/patch-1 
Fix #1872 by removing a unnecessary override
 2021-07-03 01:10:58 -07:00
PepperBell
b5c0684dd6 Rendering refactors 
- Fix fluid rendering in JEI scenes
- Add more separate options to SuperByteBuffer
- Fix copper backtank diffuse when worn
- Fix enchantment glint on custom rendered items; Closes #1846
 2021-07-03 01:03:37 -07:00
simibubi
ccbb57f518 Tiny padding tweak 2021-07-02 13:06:28 +02:00
zelophed
8550b07011 confirm again 
- fix confirmation screen not rendering its stencil elements corectly
- add a title with the current modId to config base screen
 2021-07-02 12:56:58 +02:00
simibubi
c6fa055d9b The one in orange 
- Blueprint overlay now renders a '1' for single missing items
- Dough can now be created in the mixer without the need of buckets
- JEI no longer shows all available machines as catalysts for sequenced assembly recipes
 2021-07-02 12:52:52 +02:00
simibubi
b5ff93cff0 You saw nothing 
- Tweaked item processing behaviour of mechanical saws
- Fixed placement assist not playing placement sounds
- Saws now yield more planks
- Saws can no longer process stacks of items, unless configured to
- Removed unused sounds
- Soul particles now disappear early if their location gets lit
- Stationary cursed bell range is doubled
- Mechanical Arms now require clockwork components to craft
- Extendo-grips now require clockwork components to craft
- Mechanical Arms now take significantly less stress units to power
- Added recipe for the potato cannon
- Bells no longer require ghast tears
 2021-06-30 16:55:24 +02:00
reidbhuntley
7df865b3cb No longer just for books 
- Allow Linked Controllers to be placed onto and used from Lecterns
- Set Linked Controller max stack size to 1
 2021-06-29 22:33:44 -04:00
simibubi
7548d483fd Dist patch? 2021-06-29 23:00:27 +02:00
simibubi
c6e50ad26e Dist patch 2021-06-29 22:28:14 +02:00
grimmauld
6990f6d60e Finally find the 1.16 equivalent to not calculate water pushing on contraptions (performance impact = huge) 2021-06-29 21:21:50 +02:00
macbrayne
e25a016596
Fix #1872 by removing a unnecessary override 
The parent class uses the exact same code to stop the screen from pausing. AFAIK it shouldn't break anything.
 2021-06-29 12:27:11 +02:00
PepperBell
3d825fe632 Ender potatoes 
- Add chorus fruit as potato cannon ammo
 2021-06-28 15:03:14 -07:00
simibubi
94e4f56fe1 Just enough assembly lines 
- Added JEI integration to Sequenced Assembly
- Bit of Refactoring
- The amount of steps before the transformation occurs are no longer random
- Intermediate item now shows assembly progress in its tooltip
 2021-06-28 17:02:57 +02:00
PepperBell
7b18c658b7 Polished bells 
- Fix cursed bells not rendering on contraptions
- Prevent players in spectator from creating soul pulses
- Improve and format some bell-related code
 2021-06-27 23:15:51 -07:00
reidbhuntley
9d5eecff06 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-28 00:20:47 -04:00
reidbhuntley
6cf80c60de NPE 2021-06-28 00:20:19 -04:00
simibubi
2cfb84995f Recipes in Recipe Recipes 
- Added the Clockwork Element
- Added the Sequenced Assembly recipe type (needs JEI)
- Added cascaded datagen for assembly sequence and each of its available processing types
- Temporary test recipe
- Added support for Sequenced Assembly to Press, Deployer, Spout and Saw
- Removed Integrated Circuits
- Removed Lapis sheets
 2021-06-28 04:00:24 +02:00
reidbhuntley
d0be7428aa Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java
 2021-06-27 21:46:51 -04:00
reidbhuntley
82d4a8772d Curses III, extra spooky edition 
- Added proper rendering, tooltips, sounds, and particle effects to the bells
- Added a crafting recipe for the Peculiar Bell
- Added a conversion method for obtaining Cursed Bells
- Fixed the soul indicators showing up in non-full blocks
 2021-06-27 21:38:42 -04:00
PepperBell
4bf61e049d Organize imports 2021-06-27 11:03:21 -07:00
reidbhuntley
53383dc6a2 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-27 11:47:15 -04:00
reidbhuntley
a8aa0beed9 Curses II 
- Added (temporary) rendering to the bells
- Create soul pulse effects on players holding the Cursed Bell item
 2021-06-27 11:46:56 -04:00
PepperBell
31bd6865fc Custom lighting refactor and JEI tweaks 
- Create ILightingSettings and CustomLightingSettings to better manage
custom lighting
- Allow item GuiGameElements to have custom lighting
- Add defaultBlockElement methods to automatically apply default custom
lighting to JEI scenes
- Add blaze head bobbing to JEI scenes
- Shift elements on JEI washing scene
- Use an empty screen instead of creating a new one in IScreenRenderable
 2021-06-26 23:46:10 -07:00
simibubi
e61dd71df1 No turning back now 
- Cart Assemblers now have a specific direction
- Assembled cart contraptions assemble and disassemble according to the assemblers direction
- Cart contraptions no longer turn exponentially
- Cart contraption now turn more sluggishly the larger they are
- Some changes to the cart assembler model
 2021-06-27 01:42:35 +02:00
JozsefA
586e308dd4 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-26 15:21:59 -07:00
JozsefA
80f38ef05f Soul animation stages 
- Kinda cursed state machine but it works, good start for future iteration
 - Adjust the timings
 2021-06-26 15:20:09 -07:00
Kryppers
90cdbe6941 Mellow Yellow 
made the yellow more yellow-er
 2021-06-26 20:30:05 +01:00
JozsefA
45fe9ba61c Break up the monotony, suffer a little longer 
- Soul particles last longer and loop
 - Randomly mirror the particles
 2021-06-26 11:52:28 -07:00
JozsefA
5a7a35b3cc Sounds in the right places and no stacking 2021-06-26 10:40:10 -07: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
reidbhuntley
9ddc520652 Curses 
- Added the Peculiar Bell and the Cursed Bell
 2021-06-26 12:05:38 -04:00
simibubi
fbcaa1b931 Fwoomp of Duty: Black Crops 4 
- Introduced proper first-person rendering of Potato Cannons, inherited from blockzappers
- Introduced proper dual wield handling for Potato Cannons
- Potato cannons are no longer stackable
- Added a couple more attributes to ammo types
- potatoes and carrots now plant a crop when hitting farmland
- Added a couple particle effects
- Fwoomp sound now slightly randomizes its pitch
 2021-06-26 16:32:56 +02:00
simibubi
6feacd3fc2 Fix cart contraption pickup 2021-06-26 12:28:03 +02:00
PepperBell
737b7ad255 Extra recipes 
- Add chocolate melting, honey liquification, and honey compacting
recipes
- Create honey tag field and use Forge's milk tag field
- Make fluid fields final
- Closes #1845
 2021-06-26 00:30:01 -07:00
PepperBell
de929ef510 GUI cleanup and fixes part 2 
- Change positions of more GUI elements
- Fix mistakes from last cleanup
- Add window offset to AbstractSimiScreen
- Implement container usability check properly and add
IInteractionChecker
- Render schematic and quill in schematic prompt screen
- Rename curiosities2.png to curiosities_2.png
- Various other tweaks, fixes, and improvements
- Resolves #1847
 2021-06-25 22:16:17 -07:00
simibubi
5a30c3bcdb Vegetable accelerator 
- Added the Potato Cannon
- Extendogrips now have durability, which is not consumed while wearing a copper backtank (same applies for potato cannon)
- Added a few projectile types for testing
 2021-06-26 01:17:35 +02:00
simibubi
ef74d9eef9 Ponder à la carte 
- An overview of Ponder Tags can now be opened from the game menu
 2021-06-25 00:55:40 +02:00
simibubi
12085ed909 Merge branch 'mc1.16/fluid-ponder' into mc1.16/dev 2021-06-24 23:38:56 +02:00
PepperBell
ce332bfe40 Fix config comment dividers 
New Forge versions replace empty comments with "No comment", so the
divider comment was changed from "" to " ".
 2021-06-24 14:28:40 -07:00
simibubi
40cbbf2b29 Thinking beyond Pipes 
- Pondering for Spouts, Item Drains and Portable Fluid Interfaces
- Removed tooltips for fluid components
 2021-06-24 22:37:30 +02:00
simibubi
ab8b8e41da Thinking about Pipes 
- Survival mode players can now configure the fluid supplied by a creative fluid tank
- Pondering for Tanks, Creative Tanks and Hose Pulleys
 2021-06-24 18:22:28 +02:00
simibubi
9a020dd02a Thinking via Pipes 
- Pondering for Pumps, Smart Pipes, Valves
 2021-06-24 11:49:46 +02:00
JozsefA
0c5fb3de3e Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-24 01:21:45 -07:00
JozsefA
abf8bc8a4e Fix crash on resource reload 
- Invalidate contraption renderers on context gathering
 2021-06-24 01:21:33 -07:00
PepperBell
178af2061f Fix harvester culling 
- Make harvester's render box a unit cube
- Expose manually animated speed through getter
 2021-06-23 23:05:31 -07:00
PepperBell
8d90137b1a Remove TooltipHelper.getUnformattedDeepText 
- Replace it with ITextComponent.getString
 2021-06-23 22:32:42 -07:00
JozsefA
3ce4e2c5e8 Cleanup flywheel event listeners, fix crash on server startup 2021-06-23 13:19:03 -07:00
PepperBell
0bc1a71558 Crash-proof nixie tubes 
- Add many checks when reading NBT to prevent crashes
- Store rendered strings and only update when necessary
- Reorganize some code and rename some members
 2021-06-23 12:34:12 -07:00
JozsefA
d189efd987 Whoops missed some classes 2021-06-23 00:16:24 -07:00
JozsefA
312b327161 Fix fluid rendering bug 
- ContraptionRenderDispatcher wasn't cleaning up its state, so fluids were being drawn with the wrong shader program
 2021-06-23 00:01:19 -07:00
JozsefA
64c55c1205 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	README.md
#	src/generated/resources/.cache/cache
#	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/foundation/fluid/FluidRenderer.java
 2021-06-22 21:13:34 -07:00
JozsefA
dd63c6c4e3 Cleanup and get ready to merge 2021-06-22 21:09:32 -07:00
grimmauld
e4a340deef Maybe fix NPE in basin tile entity. Probably should check more thoroughly, but this should patch it for now 2021-06-22 20:58:23 +02:00
simibubi
0a376b719e Thinking with Pipes 
- Implemented ponder scenes for Fluid Pipes and Copper Casing
- Adjusted Fluid transfer, containment and rendering behaviours to function in 'virtual' environments
 2021-06-21 18:46:31 +02:00
reidbhuntley
813a1ccaba Prevent Belts under Tunnels from picking up item entities 2021-06-20 15:00:31 -04:00
reidbhuntley
ba0e851487 Fix inconsistency with Deployers on contraptions 
- Previously Deployers would sometimes collide with the contraption entity they were a part of and their activation would be consumed
 2021-06-20 11:07:27 -04:00
reidbhuntley
e71d03c375 Fix Deployer inventory-voiding bug 
- Deployers' inventories will no longer be voided when their contraption is disassembled and reassembled before the DeployerTileEntity can initialize
 2021-06-20 01:55:08 -04: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
PepperCode1
1459be7926
Merge pull request #1565 from MarioSMB/mc1.16/dev 
Various recipe fixes and adjustments to improve mod compatibility
 2021-06-19 12:37:24 -07:00
JozsefA
652111c233 Yeet 2021-06-19 00:29:18 -07:00
reidbhuntley
cded120a0c Write NBT 2021-06-18 21:37:17 -04:00
reidbhuntley
e0941d7ba2
Merge pull request #1781 from AtlaStar/mc1.16/issue-1779-fix 
Make Basin spouts properly empty into paired Funnels
 2021-06-18 21:25:12 -04:00
reidbhuntley
f8111205b3 Temporary turnaround 
- Fixed Minecart Contraption Item's initial orientation being incorrect inconsistent in certain situations
 2021-06-18 20:44:15 -04:00
reidbhuntley
ecfa554c05 Spawn control 
- Cart Contraptions with attached Spawners can no longer be picked up with a wrench (configurable)
 2021-06-18 17:34:39 -04:00
simibubi
bc2b5169c8 The forgotten Keyframes 
- Added Keyframes to scenes created before the feature existed
 2021-06-18 22:13:34 +02:00
simibubi
91bc678ab4 Finding bugs explaining things 
- The portable fluid interface now waits until extracting pipes have completed their flow before disengaging
 2021-06-18 18:48:12 +02:00
simibubi
1bab1bc6d3 Ponder prep, Part II 
- Added scene for deployer's new item processing
- Fixed particles rendering faced away from the camera
- Fixed airflow particles not getting lit properly
- Fixed lack of culling in Gui ItemStack elements
- Prepared texts for all fluid-related storyboards
- Fixed ponder progress bar not displaying
 2021-06-18 18:13:40 +02:00
simibubi
c23071863d Ponder prep 
- Added tooltips for newly added tools and equipment
- Fixed depth issues in Ponder UI
- Fixed lack of backface culling in ponder
- Added placeholder storyboards for missing ponder scenes
- Fixed menu screen cogs rendering behind the background
- Fixed menu screen not pausing the game
 2021-06-18 12:45:43 +02:00
PepperBell
a15c9b0ad5 Fix errors from last commit 
- Create method overload in SchematicItem to solve errors
- Organize imports and do formatting in schematic related classes
 2021-06-17 20:32:52 -07:00
reidbhuntley
96e865be02 Schematic insta-placement now uses Schematicannon logic 2021-06-17 22:47:38 -04:00
PepperBell
e55ae22d7d Fix fluid tank render boxes 
- Update render box on client TE initialization and update packet
- Resolves #1669
 2021-06-17 14:43:40 -07:00
grimmauld
c1d88bbad4 Shut up non_movable. Please. 2021-06-17 22:27:48 +02:00
grimmauld
a6f0816611 No longer move obsidian by contraption (Stoopid datagen), this time for real 2021-06-17 21:55:13 +02:00
grimmauld
b76f2dffb5 Revert "No longer move obsidian by contraption (Stoopid datagen)" bc i was stupid 
This reverts commit f5b7dd7f7f.
 2021-06-17 21:45:49 +02:00
grimmauld
f5b7dd7f7f No longer move obsidian by contraption (Stoopid datagen) 2021-06-17 21:43:29 +02:00
simibubi
57f6e739e3 Return of the buttons 
- Added recipe for linked controller
- Removed soundspam of saws, needs continuous replacement
- Soundscapes are now reset on resource reload
 2021-06-17 16:20:15 +02:00
grimmauld
0a0acb3d4c Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-17 14:01:27 +02:00
grimmauld
084d240f05 Fix #1801 2021-06-17 14:01:20 +02:00
simibubi
4265a2855c Finally bearable 
- Entities can now jump on Mechanical Belts
- Entities on belts no longer get force-centered while actively moving or strafing
 2021-06-17 11:28:29 +02:00
PepperBell
1d476160cc Mechanical arm tweaks 
- Don't dance if arm speed is zero
- Rerender arm after switching back from dancing state (flywheel only)
- Formatting
 2021-06-16 17:17:16 -07:00
simibubi
06ca8b0d1c What's inside? 
- Blueprint crafting overlay now attempts to show a list of items matching an ingredient filter in the respective slot
- Fixed JEI prematurely transferring the blueprint recipe when viewed
 2021-06-17 00:54:48 +02:00
simibubi
bf1c86ed87 Flow transfer 
- Fluid pipes no longer reset their contained flows when changed to/from their windowed or encased variant
 2021-06-16 22:32:58 +02:00
simibubi
ee3d359a9a Reorder main menu 2021-06-16 21:58:46 +02:00
simibubi
158c0eba15 Blending in with Entities 
- Changed blueprint entity and item rendering to be more Optifine friendly (?)
- Punching blueprints now clears the slot before breaking it
- Fix a dist issue with KTEs
- Added recipe for blueprint
 2021-06-16 21:39:38 +02:00
PepperBell
645086e45f Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev 2021-06-16 12:21:02 -07:00
PepperBell
39e467fe1c Update mods.toml 
- Add CurseForge link, issue tracker link, and logo
 2021-06-16 12:20:08 -07:00
simibubi
788a00efdf Breaks in every port 
- Fixed the schematic hotbar overlay
- Goggles overlay is no longer its own eventhandler
 2021-06-16 17:17:55 +02:00
reidbhuntley
785242d5b3 Fix registry crash induced by AbnormalsCore 3.2.0 2021-06-15 00:57:29 -04:00
reidbhuntley
550b456396 Ejectors placed by Schematicannon keep their targets 2021-06-14 22:29:29 -04:00
reidbhuntley
d94a7faaa5 Tweaks n' configs 
- Fixed ejectors stacking unstackable items
- Tweaked infinite fluid source size configuration
- Fixed a Schematicannon crash my code from a previous commit caused
- Added config for disabling large Firework Rocket recipes
- Added config for disabling movable Spawners
 2021-06-14 22:03:06 -04:00
HebaruSan
18af709c9b
Scale hose pulley timer with server's infinite block threshold (#1752) 
Thanks for the detailed writeup!
 2021-06-14 18:02:47 -04:00
PepperBell
ec2a66357f Linked controller spectator fixes 
- Deactivate controller if in spectator mode
- Prevent packet handling if in spectator mode, except for resets
- Deactivate controller if a screen is opened
- Resolves #1774
 2021-06-13 11:22:42 -07:00
D Melton
673fc3cd8e Make Basin interaction with Funnels work 
Allows Basins to interact with downward facing Funnels located at an offset below and to the side. Previously would show a connection between basin and funnel but would not interact with them.
 2021-06-13 09:53:05 -07:00