462 commits

Author	SHA1	Message	Date
Alwinfy	759dc0ba29	Fix waves not propagating across breaks	2022-11-13 23:39:41 +00:00
Alwinfy	8fbea3cca7	Render closing loops for completed patterns	2022-11-13 23:37:39 +00:00
gamma-delta	5f6eb40549	make trulyHurt always set a death message	2022-11-13 13:07:04 -06:00
gamma-delta	440ef4d0a4	close #271	2022-11-13 13:05:31 -06:00
gamma-delta	866f2cc083	close #287	2022-11-13 12:27:51 -06:00
gamma-delta	4e2ac08f3e	close #288	2022-11-13 12:26:25 -06:00
gamma-delta	c56d7cd03a	close #285	2022-11-13 12:23:26 -06:00
gamma-delta	62a2aa3f65	close #283	2022-11-13 04:00:25 +00:00
gamma-delta	ae7f208b38	close #277	2022-11-12 21:50:00 -06:00
yrsegal@gmail.com	2e152f9b08	simplify Flock's Gambit, use formatting for display components, add first-party type names	2022-11-11 19:49:03 -05:00
gamma-delta	0193da311d	Merge branch 'main' of https://github.com/gamma-delta/HexMod	2022-11-10 10:18:59 -06:00
gamma-delta	ed10178ddc	make gemini gambit actually work	2022-11-10 10:18:52 -06:00
yrsegal@gmail.com	fd62955347	swindler's was not removing the top of the stack	2022-11-09 20:29:41 -05:00
yrsegal@gmail.com	7356b95c75	fix an incorrect merge with the impetus tooltip	2022-11-09 19:58:27 -05:00
yrsegal@gmail.com	9730a252f2	fix two arguments incorrectly being inclusive	2022-11-09 19:53:40 -05:00
yrsegal@gmail.com	61e292af10	finish mana -> media	2022-11-09 19:50:37 -05:00
gamma-delta	c9f3a4d56e	fix up texture path not working	2022-11-08 19:07:08 -06:00
gamma-delta	22e30d5cb5	Merge branch 'main' into falky-tex	2022-11-08 18:55:40 -06:00
gamma-delta	0b3138d4ed	compile dammit	2022-11-08 18:55:22 -06:00
falkory	40c2b95b93	New Textures	2022-11-09 00:39:42 +00:00
gamma-delta	b0beb23ba8	properly fix #164	2022-11-08 16:07:56 +00:00
Alwinfy	f15c975d8a	Render intersections with some buffer space	2022-11-07 22:38:20 +00:00
Alwinfy	6b2c3cd5bb	Clean up line rendering code. Slightly hacky but works in the 99% case	2022-11-07 22:38:06 +00:00
yrsegal@gmail.com	4df5f443a0	media cube no longer lies about granting all knowledge	2022-11-06 23:18:09 -05:00
yrsegal@gmail.com	b79392bc20	better display for debug patterns	2022-11-06 23:14:47 -05:00
yrsegal@gmail.com	87bcdae618	remove legacy migrator for colorizers	2022-11-06 20:35:44 -05:00
yrsegal@gmail.com	977f50b8d2	add PatternNameHelper	2022-11-06 15:11:47 -05:00
yrsegal@gmail.com	65512f9fa3	split "under" into inclusive and exclusive variants	2022-11-06 14:20:51 -05:00
gamma-delta	5d086a93b8	actually actually document bools	2022-11-06 12:56:19 -06:00
gamma-delta	c1eb1ce772	document bools	2022-11-06 12:51:34 -06:00
gamma-delta	05eaaf1d2a	prevent weird dev modmenu crash and update bool display	2022-11-06 12:47:28 -06:00
gamma-delta	c74fffa6b7	make bools actually work	2022-11-06 12:21:40 -06:00
gamma-delta	982208ba0f	fix up docs for logic ops	2022-11-06 12:12:38 -06:00
gamma-delta	9d77334e84	impl and document new read/write stuff	2022-11-06 12:09:39 -06:00
gamma-delta	2a3c234741	the cooler write (untested) (kirin pog)	2022-11-06 17:11:30 +00:00
yrsegal@gmail.com	fde595a6ce	mother of all merges	2022-11-05 23:19:04 -04:00
yrsegal@gmail.com	a01ff27453	Merge branch 'main' into 1.0 ... # Conflicts: # Common/src/generated/resources/.cache/cache # Common/src/generated/resources/assets/hexcasting/models/block/conjured.json # Common/src/main/java/at/petrak/hexcasting/api/PatternRegistry.kt # Common/src/main/java/at/petrak/hexcasting/api/addldata/ManaHolder.java # Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java # Common/src/main/java/at/petrak/hexcasting/api/item/ColorizerItem.java # Common/src/main/java/at/petrak/hexcasting/api/item/DataHolderItem.java # Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java # Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java # Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt # Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt # Common/src/main/java/at/petrak/hexcasting/api/spell/Widget.kt # Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingContext.kt # Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt # Common/src/main/java/at/petrak/hexcasting/api/spell/mishaps/MishapNoSpellCircle.kt # Common/src/main/java/at/petrak/hexcasting/api/spell/mishaps/MishapNotEnoughArgs.kt # Common/src/main/java/at/petrak/hexcasting/api/utils/ManaHelper.kt # Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java # Common/src/main/java/at/petrak/hexcasting/client/ShiftScrollListener.java # Common/src/main/java/at/petrak/hexcasting/client/gui/GuiSpellcasting.kt # Common/src/main/java/at/petrak/hexcasting/common/blocks/akashic/BlockAkashicFloodfiller.java # Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityStoredPlayerImpetus.java # Common/src/main/java/at/petrak/hexcasting/common/casting/RegisterPatterns.java # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWrite.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIdentityKindOf.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBreakBlock.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpConjureBlock.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpCreateWater.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpDestroyWater.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpEdifySapling.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpErase.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpExplode.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpExtinguish.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpIgnite.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpPlaceBlock.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpPotionEffect.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpTheOnlyReasonAnyoneDownloadedPsi.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpBrainsweep.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpCreateLava.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpTeleport.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt # Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt # Common/src/main/java/at/petrak/hexcasting/common/command/ListPatternsCommand.java # Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java # Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java # Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java # Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java # Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java # Common/src/main/java/at/petrak/hexcasting/common/network/MsgNewSpellPatternAck.java # Common/src/main/java/at/petrak/hexcasting/common/network/MsgShiftScrollSyn.java # Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java # Common/src/main/java/at/petrak/hexcasting/datagen/HexItemTagProvider.java # Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.kt # Common/src/main/java/at/petrak/hexcasting/mixin/accessor/client/AccessorMouseHandler.java # Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java # Common/src/main/resources/assets/hexcasting/lang/en_us.json # Fabric/gradle.properties # Fabric/src/generated/resources/.cache/cache # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_black.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_blue.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_brown.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_cyan.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_gray.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_green.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_blue.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_gray.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_lime.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_magenta.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_orange.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_pink.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_purple.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_red.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_white.json # Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_yellow.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_agender.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aroace.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aromantic.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_asexual.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_bisexual.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demiboy.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demigirl.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_gay.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderfluid.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderqueer.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_intersex.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_lesbian.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_nonbinary.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_plural.json # Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_transgender.json # Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexClientInitializer.kt # Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt # Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/CCDataHolder.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/HexCardinalComponents.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/BrainsweepRecipeCategory.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/HexREIPlugin.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/PatternRendererREI.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/recipe/FabricUnsealedIngredient.java # Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt # Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java # Fabric/src/main/resources/fabric.mod.json # Forge/build.gradle # Forge/gradle.properties # Forge/src/generated/resources/.cache/cache # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_black.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_blue.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_brown.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_cyan.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_gray.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_green.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_blue.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_gray.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_lime.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_magenta.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_orange.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_pink.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_purple.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_red.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_white.json # Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_yellow.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_agender.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aroace.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aromantic.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_asexual.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_bisexual.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demiboy.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demigirl.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_gay.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderfluid.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderqueer.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_intersex.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_lesbian.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_nonbinary.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_plural.json # Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_transgender.json # Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexClientInitializer.java # Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java # Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java # Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java # Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java # Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java # Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java # Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java # Forge/src/main/java/at/petrak/hexcasting/forge/recipe/ForgeUnsealedIngredient.java # Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java # Forge/src/main/resources/META-INF/accesstransformer.cfg # gradle.properties	2022-11-05 21:49:59 -04:00
yrsegal@gmail.com	63495a423f	unify tabs (this will make the merge about 1000x easier)	2022-11-05 21:16:22 -04:00
yrsegal@gmail.com	7db77e8bc5	add spaces back to the list iota, fix strobing	2022-11-05 19:57:28 -04:00
yrsegal@gmail.com	7980289673	gambits are possessive	2022-11-05 19:46:49 -04:00
gamma-delta	0ea05ab030	separate foot/eye pos	2022-11-05 23:01:52 +01:00
gamma-delta	8ce90a5c1d	very untested but ready (?) to send to patrons	2022-11-05 22:43:00 +01:00
yrsegal@gmail.com	a4c14e5ef1	broken iotas don't display as empty	2022-11-05 16:09:50 -04:00
gamma-delta	8862304f96	Merge branch '1.0' of https://github.com/gamma-delta/HexMod into 1.0	2022-11-05 20:36:20 +01:00
gamma-delta	4395ed8092	start transitioning to boolean	2022-11-05 20:36:15 +01:00
yrsegal@gmail.com	9ec4ecfb73	fix defaulting showing up as null instead of rainbow	2022-11-05 15:35:17 -04:00
yrsegal@gmail.com	95b78b551b	fix #162	2022-11-05 15:30:38 -04:00
gamma-delta	e9c45c803e	Merge branch '1.0' of https://github.com/gamma-delta/HexMod into 1.0	2022-11-05 20:11:58 +01:00
gamma-delta	06f58f4093	good catch, robotgiggle	2022-11-05 20:11:51 +01:00
yrsegal@gmail.com	ae07475528	fix #193, #192	2022-11-05 15:04:39 -04:00