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
yrsegal@gmail.com
e7382036d9
Fix z-fighting and use forge render type format
...
Closes #163
2022-11-05 15:04:38 -04:00
gamma-delta
13183c7ef1
fix vec3 colors
2022-11-05 19:45:15 +01:00
gamma-delta
fba6838b64
actually add everything
2022-11-05 19:40:50 +01:00
gamma-delta
24760b717c
working on new stack ops
2022-11-05 19:34:01 +01:00
yrsegal@gmail.com
dcfc11be68
fix akashic bookshelves
2022-11-05 13:44:18 -04:00
yrsegal@gmail.com
b9c0ced020
fix poitype change to predicate
2022-11-05 13:09:30 -04:00
gamma-delta
5295a0e4b9
forge coughs to life
2022-11-04 19:41:02 -05:00
gamma-delta
e5a077f67e
it compiles on fabc!
2022-11-04 18:21:08 +01:00
gamma-delta
d148552a81
*now* it's compiling, at least on forge
2022-11-04 17:31:18 +01:00
gamma-delta
7c65777e22
it compiles!
2022-11-03 18:29:48 +01:00
gamma-delta
45242592a5
pedantic fmting things
2022-11-02 16:04:22 +01:00
gamma-delta
5a8f8317c9
port lookup to java
2022-11-02 15:49:49 +01:00
yrsegal@gmail.com
a8ec68a846
fix draining items having weird behavior if passed a stack it can drain from
2022-10-24 12:37:31 -04:00
yrsegal@gmail.com
5193a20a0a
Another debug cube feature
2022-10-17 21:53:19 -04:00
yrsegal@gmail.com
cf1d65cae0
fix frozen colorizers being weird on fabric
2022-10-17 21:52:30 -04:00
yrsegal@gmail.com
7e9ffbee7a
fix #263
2022-10-15 21:13:52 -04:00
yrsegal@gmail.com
96c3daeca4
fix #264
2022-10-15 21:12:13 -04:00
yrsegal@gmail.com
67a019945f
euler paths avoid clashes, generate new great spells
2022-10-04 10:30:42 -04:00
yrsegal@gmail.com
505a97266c
this is probably something we shouldn't let teleport
2022-10-01 13:04:45 -04:00
yrsegal@gmail.com
51275356ab
change cooler readable as well
2022-10-01 12:57:03 -04:00
yrsegal@gmail.com
1d6bb87864
Close #123
2022-10-01 12:52:37 -04:00
yrsegal@gmail.com
051a334e85
"empty" is clearer than "0 tall"
2022-09-30 22:23:45 -04:00
yrsegal@gmail.com
6e6a2f60ae
fix #257
2022-09-30 20:50:07 -04:00
yrsegal@gmail.com
0c3dfa9020
Fix #243
2022-09-30 20:41:21 -04:00
yrsegal@gmail.com
4be578ecdd
Fix #239
2022-09-30 20:33:51 -04:00
yrsegal@gmail.com
44c96f1ee0
Close #240
...
This doesn't completely eliminate the issue but it does mitigate it significantly
2022-09-30 20:31:25 -04:00
yrsegal@gmail.com
9d34fcf1b7
Close #258
2022-09-30 20:29:01 -04:00
gamma-delta
4acfc707a7
bang on #253 . this in no way fixes it and i'm halfway convinced it's a FD error
2022-09-22 09:18:19 -05:00
yrsegal@gmail.com
b8c3331592
fix a concerning exploit with dividing by zero
2022-09-18 11:47:56 -04:00
yrsegal@gmail.com
9aa3019571
fix gradle again...
...
by specifying jar it should still be faster in general, but...
2022-08-29 12:20:12 -04:00
petrak@
d327d4d943
Merge branch 'main' into fix173+175
2022-08-28 22:11:54 -05:00
yrsegal@gmail.com
a7c827b662
AAAARGH
2022-08-28 23:09:25 -04:00
yrsegal@gmail.com
c914f34942
fix gradle being painfully slow, but again
2022-08-28 22:48:25 -04:00
gamma-delta
a092047e33
Clean up some advancements.
...
- Root now accepts any of the 3 denominations of amethyst
- Changed some wordings to hint at how to achieve enlightenment in the
advancmenets
- Remove some ableist language
2022-08-28 21:46:05 -05:00
gamma-delta
95107b650a
Merge branch 'main' of https://github.com/gamma-delta/HexMod
2022-08-28 21:26:01 -05:00
gamma-delta
6675e80ced
Fix greater sentinel claiming it costs 2 dust while actually only costing 1
2022-08-28 21:25:54 -05:00
