Commit graph

610 commits

Author SHA1 Message Date
petrak@
220ac8bcab re #280, upload things to the GPU in bigger chunks 2022-11-20 19:59:00 -06:00
petrak@
3d56f0f826 close #303 2022-11-20 16:09:06 -06:00
petrak@
ba42d97872 start work on arbitrary brainsweeps 2022-11-20 15:46:12 -06:00
petrak@
30dc2e93c8 close #291 2022-11-19 23:18:40 -06:00
petrak@
5920e0b9a4 fix #294 2022-11-19 22:30:44 -06:00
petrak@
7dc05d2951 maybe fix #286 2022-11-19 21:21:42 -06:00
Alwinfy
cec40696d1
oops 2022-11-16 13:39:24 -05:00
Alwinfy
f76d71bfe0
oops fix the audio thing 2022-11-16 01:08:36 -05:00
Alwinfy
3b367dcd9b
Pay a cost for every continuation jump 2022-11-16 00:58:51 -05:00
Alwinfy
7467687fad
DRY eval/cc 2022-11-16 00:58:29 -05:00
Alwinfy
cc3691d9c9
Merge remote-tracking branch 'origin/main' into eval/cc 2022-11-16 00:48:06 -05:00
gamma-delta
5258208585 actually implement #291 ops with a generic-er class 2022-11-15 23:26:16 -06:00
gamma-delta
399f8c5cad re #291, nip 2022-11-15 22:12:29 -06:00
gamma-delta
22fe434328 re #291, pick 2022-11-15 22:11:04 -06:00
gamma-delta
9ca5738317 WITH CATLIKE TREAD! UPON OUR PREY WE STEAL! IN SILENCE DREAD! OUR CAUTIOUS WAY WE FEEL! NO SOUND AT ALL! WE NEVER SPEAK A WORD! A FLY'S FOOTFALL WOULD BE DISTINCTLY HEARD! 2022-11-15 21:09:30 -06:00
Alwinfy
cd64f6394e
add eval/cc, aka continuation, aka OpEvalBreakable, aka Iris 2022-11-15 20:06:25 -05:00
gamma-delta
03dd09c6de amethyst dust now makes scrolls have the offset marks 2022-11-14 20:35:48 -06:00
gamma-delta
4aae1ed6b0 chronicler's gambit now has a particle spray 2022-11-13 23:37:35 -06:00
gamma-delta
47c429bc7b close #288 2022-11-13 23:29:52 -06:00
gamma-delta
558476caf4 apply winfy patches 2022-11-13 23:40:00 +00:00
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
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
0b3138d4ed compile dammit 2022-11-08 18:55:22 -06: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
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
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
gamma-delta
0ea05ab030 separate foot/eye pos 2022-11-05 23:01:52 +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
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
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
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
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
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
6675e80ced Fix greater sentinel claiming it costs 2 dust while actually only costing 1 2022-08-28 21:25:54 -05:00
yrsegal@gmail.com
f7163127df be a bit more lenient with blocked overcast damage 2022-08-28 19:55:52 -04:00
yrsegal@gmail.com
cf03cc95b5 fix enlightenment being effectively impossible to obtain 2022-08-28 19:34:24 -04:00
yrsegal@gmail.com
63db46aff9 fix nonsensical error messages for scribe's 2022-08-28 12:32:45 -04:00
yrsegal@gmail.com
25fea447a5 fix selection of items for placing being weird 2022-08-27 09:11:19 -04:00
yrsegal@gmail.com
32fed35beb patterns now have innate names
currently only matters for mishaps
2022-08-26 14:40:38 -04:00
yrsegal@gmail.com
240f021194 Fluid creation hexes can insert partial, destroy fluid can drain tanks
Closes #216
2022-08-25 21:09:51 -04:00
yrsegal@gmail.com
6418e9b95e Akashic libraries now have a range limit 2022-08-25 21:08:15 -04:00
yrsegal@gmail.com
0ba1c36ad9 Phials now always show media amounts (in dust) 2022-08-25 21:06:18 -04:00
yrsegal@gmail.com
8ea5b53ee2 fix change to discovery not allowing for unstackables 2022-08-22 23:29:22 -04:00
yrsegal@gmail.com
2ae33cf82d fix #228 2022-08-22 22:34:00 -04:00
yrsegal@gmail.com
ed2abee735 fix double-use of getHeldItemToOperateOn 2022-08-22 22:29:00 -04:00
yrsegal@gmail.com
1afd21b5bb ManaHolders can now control recharging 2022-08-18 16:12:18 -04:00
yrsegal@gmail.com
2a097603cb operative slots are now a discovery as well 2022-08-17 13:47:44 -04:00
yrsegal@gmail.com
36321c3cd0 discovery of grid scale modifiers and item slots 2022-08-17 13:38:29 -04:00
yrsegal@gmail.com
cc5267d2a4 fix dupe bugs with yeeting 2022-08-16 23:17:39 -04:00
yrsegal@gmail.com
6c574fb9ac swap choice of casting and other
this makes trinkets preferentially recharge/erase/etc other things
2022-08-16 23:07:02 -04:00
yrsegal@gmail.com
8c13fc22dc media can now be drawn from trinkets, armor, and offhand
also, armor can no longer keep you safe from the subsuming of your mind
2022-08-16 22:11:51 -04:00
yrsegal@gmail.com
bcd897f4e1 fix some crashes with invalid angles via nbt editing 2022-08-13 14:24:44 -04:00
yrsegal@gmail.com
c3c63af67c curse of binding is respected by OpTeleport
this is mostly because oh god it can drop quark backpacks otherwise
2022-08-12 12:37:41 -04:00
yrsegal@gmail.com
c8f4e847b9 fix projection 2022-08-10 18:16:15 -04:00
yrsegal@gmail.com
cbe1c77433 jei/rei/emi for edify and craft phial 2022-08-09 13:49:57 -04:00
yrsegal@gmail.com
027a3d0139 fix #194 2022-08-08 22:27:26 -04:00
yrsegal@gmail.com
b77d751357 fix thoth exceeding depth crashing instead of mishapping 2022-08-08 21:40:44 -04:00
yrsegal@gmail.com
24e98169e6 fix excisor's sometimes disintegrating lists 2022-08-06 17:22:13 -04:00
yrsegal@gmail.com
1febaf703a fix #196 2022-08-06 11:46:24 -04:00
yrsegal@gmail.com
65b33e70c7 fix #199 2022-08-06 11:43:34 -04:00
yrsegal@gmail.com
c53cc12d05 fix #197 2022-08-06 11:37:38 -04:00
yrsegal@gmail.com
958db00b15 close #201 2022-08-06 11:34:33 -04:00
yrsegal@gmail.com
d83c7accc7 fix #210 2022-08-06 11:11:23 -04:00
yrsegal@gmail.com
f281d4d561 fix #211 2022-08-06 11:00:52 -04:00
yrsegal@gmail.com
bd833486b6 skilletsexual 2022-08-06 09:38:33 -04:00
yrsegal@gmail.com
513037bb1a fix double-tp 2022-07-31 09:21:00 -04:00
yrsegal@gmail.com
4ceb5416fb fix inconsistencies with teleport updating 2022-07-31 09:15:59 -04:00
yrsegal@gmail.com
a5d25eba2e this just in: farmers may be delighted 2022-07-27 23:08:55 -04:00
gamma-delta
e6767ae224 close #186 2022-07-27 11:55:59 -05:00
gamma-delta
4d95a57a17 version bump and close #190 2022-07-26 23:16:57 -05:00
gamma-delta
33b50f4a82 fix #188 2022-07-26 13:42:52 -05:00
gamma-delta
81e5f8581e close #189 (anything under 1 tick is a no-op) 2022-07-26 11:49:25 -05:00
yrsegal@gmail.com
868086009f port swindler's cost removal from 1.0 2022-07-26 10:29:57 -04:00
yrsegal@gmail.com
508dde11ef the lens sees the bees 2022-07-25 20:11:06 -04:00
yrsegal@gmail.com
e083b31101 cleanups 2022-07-25 13:16:08 -04:00
yrsegal@gmail.com
84b6448579 Merge branch 'main' of https://github.com/gamma-delta/HexMod into fix173+175
# Conflicts:
#	Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
2022-07-25 13:07:38 -04:00
gattsuru
e677e54313 Improve Comments and Readability for AkashicTreeGrower init 2022-07-25 12:55:43 -04:00
yrsegal@gmail.com
4ed6f299e7 trinkets/curios integration 2022-07-25 10:56:23 -04:00
yrsegal@gmail.com
1424cff844 add more block protection hooks
Port of 96e4569b24
2022-07-24 21:45:46 -04:00
yrsegal@gmail.com
96e4569b24 add more block protection hooks 2022-07-24 20:30:58 -04:00
yrsegal@gmail.com
e05720d80e Fix #110
port of 2e76655d21
2022-07-24 20:22:31 -04:00
yrsegal@gmail.com
41deea129c Close #160
port of 287fadc8ce
2022-07-24 20:20:07 -04:00
yrsegal@gmail.com
f0b85dfb3a Fix #135
port of 21ce790bb7
2022-07-24 20:16:51 -04:00
yrsegal@gmail.com
549d6f685c Fix #136
port of 1b01174186
2022-07-24 20:07:09 -04:00
yrsegal@gmail.com
25b594d75a Fix #156
port of 2be0021185
2022-07-24 20:04:36 -04:00
yrsegal@gmail.com
64c143cfe9 Fix #154
port of 02804df55c
2022-07-24 20:03:45 -04:00
yrsegal@gmail.com
150f646ddf Fix #152
port of 9d089a20a6
2022-07-24 20:03:07 -04:00
yrsegal@gmail.com
7e92a8352c fix the cost of bonemeal
port of b7561ce619
2022-07-24 20:02:21 -04:00
yrsegal@gmail.com
d46cafeb05 close #161, close #117
port of a42f6e87f8
2022-07-24 20:01:51 -04:00
yrsegal@gmail.com
e404aa7c2e fix #174 2022-07-24 19:54:14 -04:00
yrsegal@gmail.com
5201063d69 fix #172 2022-07-24 19:50:44 -04:00
yrsegal@gmail.com
941480e703 fix #182 2022-07-24 19:49:40 -04:00
yrsegal@gmail.com
3bd05c9484 fix #185 2022-07-24 19:48:23 -04:00
yrsegal@gmail.com
cc24932854 create compat 2022-07-24 16:51:57 -04:00
yrsegal@gmail.com
87ed547716 flight is no longer broken 2022-07-24 11:56:30 -04:00
gattsuru
8824415611 Fix Flight Duration In Fabric 2022-07-22 14:58:17 -04:00
yrsegal@gmail.com
2e76655d21 Close #110 2022-07-03 00:00:10 -04:00
yrsegal@gmail.com
287fadc8ce Close #160 2022-07-02 23:59:10 -04:00
yrsegal@gmail.com
21ce790bb7 fix #135 2022-07-02 23:58:47 -04:00
yrsegal@gmail.com
1b01174186 fix #136 2022-07-02 23:23:28 -04:00
yrsegal@gmail.com
2be0021185 fix #156 2022-07-02 23:01:59 -04:00
yrsegal@gmail.com
02804df55c fix #154 2022-07-02 23:00:56 -04:00
yrsegal@gmail.com
9d089a20a6 Fix #152 2022-07-02 22:56:45 -04:00
yrsegal@gmail.com
b0accc1bfc Merge 2022-07-02 22:52:27 -04:00
yrsegal@gmail.com
b7561ce619 fix cost of bonemeal 2022-07-02 22:34:24 -04:00
yrsegal@gmail.com
a42f6e87f8 Close #161, #117 2022-07-02 22:33:54 -04:00
gamma-delta
d8412cfd11 version bump and make hermes on a pattern not inc depth 2022-06-27 10:20:05 -05:00
gamma-delta
0f4c69d1f8 close #141. really good call, this feels much more sturdy at a high proportion 2022-06-23 15:27:07 -05:00
gamma-delta
96c8736930 close #125 2022-06-23 14:59:04 -05:00
gamma-delta
b9f41abb5c how do you like that obama i pissed on the git 2022-06-16 11:52:20 -05:00
gamma-delta
675eaafe8b fix some problems with ravenminds breaking prescience 2022-06-16 11:49:07 -05:00
gamma-delta
d80ace0812 make the casting UI less of an eyesore maybe 2022-06-16 10:15:27 -05:00
gamma-delta
8ea2a6d66d merge in some fixes from main 2022-06-15 21:28:33 -05:00
gamma-delta
18277aec41 remove this dumb comment 2022-06-15 21:25:25 -05:00
gamma-delta
c922b13c3f fix #127 (they are actually in the right namespace, I just registered them to the datafixer wrong) 2022-06-15 21:17:18 -05:00
gamma-delta
744c6e1fd8 keep renaming things. fix #115 2022-06-15 21:00:46 -05:00
gamma-delta
3638ec7b01 close #126 2022-06-15 16:26:03 -05:00
yrsegal@gmail.com
f8468b8862 show skins for real for real this time 2022-06-15 17:04:41 -04:00
yrsegal@gmail.com
13d97af5bf fix looking at an old cleric impetus with a lens crashing 2022-06-15 16:54:09 -04:00
gamma-delta
726fc8427e merge in the lore 2022-06-14 20:42:52 -05:00
gamma-delta
bdec14b202 IT RUNS ON FORGE AND FABRIC 2022-06-14 20:41:03 -05:00
yrsegal@gmail.com
71a0b11d25 drop reduced dust and crystals even if not using the proper tool 2022-06-14 21:16:07 -04:00
yrsegal@gmail.com
bf5c908273 thoth always either evaluates or errors 2022-06-14 20:51:51 -04:00
gamma-delta
434c480b0b kotlin now compiles! ... now onto java 2022-06-14 14:35:06 -05:00
yrsegal@gmail.com
72a1f28902 fix place block using the wrong context 2022-06-14 10:20:40 -04:00
gamma-delta
8b7369fe8b do spells and finish up the harness ... now onto blocks! 2022-06-14 02:11:38 -05:00
gamma-delta
2917a3b358 who am i, wire? converted all non-spell actions to the new iotas 2022-06-14 01:02:20 -05:00
yrsegal@gmail.com
f2555fa4d6 fix #122 2022-06-13 23:29:47 -04:00
gamma-delta
71c3cade9b and now for the part of the show where we refactor every single operator 2022-06-13 22:02:50 -05:00
gamma-delta
8261063208 more manual fixes 2022-06-13 20:29:30 -05:00
yrsegal@gmail.com
a6369674ba sort tags 2022-06-13 21:28:03 -04:00
yrsegal@gmail.com
7286ddc8ae fix jeweler's hammer not dropping full amethyst loot 2022-06-13 21:26:12 -04:00
gamma-delta
6f4497a18f whoopsy it modified things in caches. oh well. 2022-06-13 19:41:13 -05:00
gamma-delta
7403d87e6f kotlin went great, now for java 2022-06-13 19:26:39 -05:00
gamma-delta
e00757331e pushing to have a backup if i mess up sed 2022-06-13 19:02:46 -05:00
gamma-delta
ba9028010f make foci/spellbooks overlays based 2022-06-13 18:38:24 -05:00
gamma-delta
d0f43ff0d9 rename lots of things 2022-06-13 16:45:22 -05:00
gamma-delta
fb246ef883 finish making types 2022-06-13 13:58:53 -05:00
gamma-delta
029869b247 make blink not free when less than a block 2022-06-13 12:29:30 -05:00
gamma-delta
a9c8be1212 still doesn't compile, but now feat. registries 2022-06-13 01:39:12 -05:00
gamma-delta
61926ca299 Rebase this onto the 1.0 branch 2022-06-12 23:57:16 -05:00
yrsegal@gmail.com
10c9d074b8 prevent nbt editing from causing crashes on foci and such 2022-06-12 22:33:48 -04:00
gamma-delta
fef331d8e0 formatting 2022-06-12 20:30:05 -05:00
gamma-delta
06c7f97585 whoops 2022-06-12 20:29:47 -05:00
yrsegal@gmail.com
fc225b1afa fix impetus player head loading being weird 2022-06-12 19:53:14 -04:00
gamma-delta
411e85579f fix the jar not including everything on forge 2022-06-12 17:00:38 -05:00
gamma-delta
952b53eaed this actually seems more helpful 2022-06-12 15:10:45 -05:00
gamma-delta
c8e252497c *actually* close #102 2022-06-12 15:07:49 -05:00
gamma-delta
6ad14e6fc8 close #101 ... well, more like touch up 2022-06-12 15:06:10 -05:00
gamma-delta
bf4682260d close #114 2022-06-12 13:48:20 -05:00
gamma-delta
608fd0e4c2 close #116 and also whoops i forgor to run datagen in a while 2022-06-12 12:38:45 -05:00
gamma-delta
8ef43af35d Close #113 and document naming pages 2022-06-12 12:13:47 -05:00
gamma-delta
c4a5f97129 close #102 2022-06-12 11:55:18 -05:00
gamma-delta
1b1b43dcfe Close 112 2022-06-12 11:54:28 -05:00
yrsegal@gmail.com
3019e4c35a oops. 2022-06-11 18:43:48 -04:00
yrsegal@gmail.com
cea2d33cfa make weakmapped safer, and document 2022-06-11 18:38:45 -04:00
gamma-delta
c16002e832 ok jk i want 8x scale 2022-06-10 18:45:55 -05:00
gamma-delta
25afe5a74b yeah i probably shouldve seen that one coming 2022-06-10 18:41:22 -05:00
gamma-delta
6109fffc32 Merge branch 'main' of https://github.com/gamma-delta/HexMod 2022-06-09 20:32:39 -05:00
gamma-delta
b7a554dd75 make the spell circle spells no longer great 2022-06-09 20:32:25 -05:00
yrsegal@gmail.com
481a9aef5d don't use valueOf explicitly 2022-06-09 19:18:24 -04:00
yrsegal@gmail.com
233fb28eac make some progress towards fixing fabulous conjures 2022-06-09 17:02:19 -04:00
yrsegal@gmail.com
b0bdbb7d76 fix some villager and rendering jank 2022-06-09 17:01:51 -04:00
gamma-delta
63ea5822dd hopefully prevent fork bombs, fix #106 2022-06-09 13:54:30 -05:00
yrsegal@gmail.com
8cbcea2833 fix the sentinel sometimes rendering weird 2022-06-08 20:50:25 -04:00
yrsegal@gmail.com
ae89127572 fix a stateleak 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
0895fc972c fix obfuscation 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
2ddd3c54e4 more categories 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
86c57198ce for height modifiers 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
c4dceeeede weak reference utils, migrate villager prep code into central location 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
b25cffd814 some minor tag changes 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
70067b97bc show "minecraft:villager" if no profession 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
f91b26057e advanced/regular tooltips 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
d188a20366 you ever just grayscale 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
28404a6593 emi! 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
e246d31926 fix CI not building 2022-06-07 19:21:57 -04:00
yrsegal@gmail.com
811adff148 huh, boolean flip here 2022-06-07 19:10:18 -04:00
yrsegal@gmail.com
54724ac95e fix custom item handlers being weeeird with impetuses
I also finally got that fabric fluid transfer thing implemented, woo
2022-06-07 17:41:20 -04:00
yrsegal@gmail.com
4e6d47de41 resolve fabric todos 2022-06-07 14:57:16 -04:00
yrsegal@gmail.com
59378e8031 i need to stop copypasting 2022-06-06 22:03:23 -04:00
yrsegal@gmail.com
01dba3419d fix potion effects being able to go into the weird negative range 2022-06-06 21:10:20 -04:00
yrsegal@gmail.com
51a4ae9dcd fix impetus only showing it's bound when bound to a player in world 2022-06-06 10:09:23 -04:00
yrsegal@gmail.com
9b0487688c creative unlocker now can show you mana usages 2022-06-04 18:17:10 -04:00
yrsegal@gmail.com
31d40b7555 migrate old colorizers 2022-06-04 14:27:55 -04:00
gamma-delta
1b22e63a1f start work on lore 2022-06-04 13:01:09 -05:00
yrsegal@gmail.com
0edc687a60 open up scroll loot tables to config 2022-06-04 12:23:25 -04:00
yrsegal@gmail.com
e61b5c1255 fix comparator output not showing on fabric 2022-06-04 10:24:31 -04:00
yrsegal@gmail.com
f08959d90e fix akashic records not working on fabric 2022-06-04 10:18:00 -04:00
gamma-delta
c121211369 messed up the json generation; pushing a commit to have somewhere to fall back on if jq fails 2022-06-03 21:59:19 -05:00
yrsegal@gmail.com
b652625706 wow. how did I miss this one 2022-06-02 20:01:50 -04:00
gamma-delta
bf35952778 lilliputian 2022-06-02 02:11:48 -05:00
gamma-delta
772d94cd9e add multiple scroll sizes 2022-06-02 00:51:29 -05:00
gamma-delta
272f81e36b add gravichanger compat, add stubs for pehkui, and rebalance flight 2022-06-01 21:53:24 -05:00
yrsegal@gmail.com
7a297ed216 villagers now are offended by mind murder 2022-06-01 00:23:14 -04:00