Commit graph

781 commits

Author SHA1 Message Date
petrak@ 4010ea6d9e move more things 2023-01-21 17:35:41 -06:00
petrak@ 05e4114b97 fully make greatness a tag 2023-01-21 15:49:20 -06:00
petrak@ 2f2ab69816 fixed action tags not working on fabc 2023-01-21 14:51:40 -06:00
petrak@ 7e7b5ff3ae it appears to work?! 2023-01-21 14:08:31 -06:00
petrak@ 4af930e7a7 data: genned 2023-01-21 13:23:24 -06:00
petrak@ e900e4d62b it's compiling! 2023-01-21 12:45:32 -06:00
petrak@ ede95c4b49 creeping towards compilation 2023-01-21 11:53:23 -06:00
petrak@ 5d8b7a61eb this does not compile even a little bit but i'm pushing so i'm not anxious having code on my HD 2023-01-20 13:27:35 -06:00
petrak@ 7748cf7387 that sucked 2022-12-30 17:00:52 -05:00
petrak@ baf74c64cc converting the ersatz registry. this mega sucks 2022-12-30 14:50:50 -05:00
petrak@ 573fbb738a oh god, this is gonna suck 2022-12-30 13:43:38 -05:00
petrak@ 5f9ced55fc clean up xplat 2022-12-30 13:07:21 -05:00
petrak@ bdbb8b0e83 MVP ready 2022-12-30 13:00:47 -05:00
petrak@ c3ebba18f0 finish logic for entity ingrs 2022-12-28 14:11:28 -05:00
petrak@ 2acf7920b5 Merge branch 'main' into arbitrary-brainsweeps
Keep up to date with main
2022-12-28 13:33:15 -05:00
ChuijkYahus bf4a6f504b
fix 2022-12-13 13:31:16 +08:00
ChuijkYahus 27b7a4e6c4
Merge branch 'gamma-delta:main' into main 2022-12-13 13:17:33 +08:00
petrak@ deec17376f at the behest of my friend Terabithia, who helped me write the lore, change the character's name to Cardamom 2022-12-03 12:05:38 -05:00
petrak@ 9616b89979 redocument flock's refl, close #338 2022-12-03 11:52:45 -05:00
petrak@ 11e576c7e5 Merge branch 'main' of https://github.com/gamma-delta/HexMod
Oh for god's sake just pull
2022-12-03 11:32:00 -05:00
petrak@ f070b271ff fixerman's gambit (close #345) 2022-12-03 11:31:19 -05:00
petrak@ 59418e28fe
Merge pull request #346 from Cypher121/patch-2
Soft-fail if looking up action for mishap gets nothing back
2022-12-03 11:16:51 -05:00
petrak@ a0fde191d4 keep on mergin 2022-12-03 11:16:22 -05:00
June a7d83782b6
More try-catch for getUpdate 2022-12-03 15:29:16 +01:00
June 503d5db16c
Fix #343 2022-12-03 06:22:05 +01:00
June 68db125848
Fix Hermes reading from bottom of the stack
Closes #339
2022-12-01 18:37:09 +01:00
ChuijkYahus 07dc07aaca
update 2022-11-30 10:39:50 +08:00
ChuijkYahus 416292c556
Merge branch 'gamma-delta:main' into main 2022-11-30 10:37:20 +08:00
petrak@ 949e4bb292 fix #325 2022-11-29 15:24:44 -05:00
petrak@ 8216dd984e fix #323 2022-11-29 14:25:53 -05:00
petrak@ 725aa894d4 probably fix #327? 2022-11-29 14:21:38 -05:00
petrak@ 3a8dfa6cc8 fix #329 and fix #332 2022-11-29 13:42:31 -05:00
ChuijkYahus 04cb6651bc
update 2022-11-30 01:43:21 +08:00
petrak@ de8e84cdbd probably fix #329? i wasn't able to reproduce 2022-11-29 12:35:12 -05:00
petrak@ 30c81e2008 close #331, document 2dup, and clean up langfile 2022-11-29 12:18:01 -05:00
petrak@ 33ba0ee4e1 rrgh 2022-11-29 12:07:08 -05:00
petrak@ f5a7a5fe82
Merge pull request #322 from ChuijkYahus/main
Update zh_cn.json
2022-11-29 10:51:56 -06:00
ChuijkYahus 71904e282c
fix 2022-11-24 09:35:01 +08:00
ChuijkYahus 71891078f8
fix 2022-11-24 01:32:24 +08:00
ChuijkYahus 4a26dbf706
fix 2022-11-23 18:09:47 +08:00
ChuijkYahus 8453410557
fix 2022-11-23 09:32:07 +08:00
petrak@ 7c00cbaec8 possibly impl arbitrary brainsweeps. i don't know. i'm in offline mode 2022-11-22 19:31:09 -06:00
ChuijkYahus fd80f45aca
fix 2022-11-23 09:30:56 +08:00
ChuijkYahus 7dc7698592
fix 2022-11-23 09:28:53 +08:00
ChuijkYahus 1518ce2a0d
fix 2022-11-23 09:28:39 +08:00
petrak@ 30701702c7 Merge branch 'main' into arbitrary-brainsweeps 2022-11-22 09:44:20 -06:00
petrak@ 0d90addd8d fix #321 2022-11-22 09:40:08 -06:00
ChuijkYahus aa5c918525
config lines 2022-11-22 23:29:02 +08:00
Alwinfy 1da56cd2dc
Merge remote-tracking branch 'origin/main' into eval/cc 2022-11-22 00:31:38 -05:00
petrak@ 1cf08a135c close #317 2022-11-21 22:20:29 -06:00
petrak@ fc62374f75 better particles for chronicler's gambit 2022-11-21 22:19:31 -06:00
petrak@ 274bec11d6 fix 292 2022-11-21 21:59:22 -06:00
petrak@ 79fea68588 close #301 2022-11-21 20:42:49 -06:00
petrak@ 2736b3616d close #302 2022-11-21 20:33:59 -06:00
petrak@ d8715c3604 remove the default dot speed because there's no dot anymore 2022-11-21 20:05:30 -06:00
petrak@ 8f43bdb5fe some day i will spell that goddamn word right (close #306) 2022-11-21 20:05:12 -06:00
petrak@ 76006d72dc finish sound cleanup and also other things cleanup 2022-11-21 19:48:25 -06:00
petrak@ 7699a5e468 start work on making sounds badnt 2022-11-21 17:55:36 -06:00
petrak@ 979fc3aa35 close #316 2022-11-21 14:54:57 -06:00
petrak@ 8fbb6acbf9 minor speling mistake 2022-11-21 14:08:06 -06:00
petrak@ 3f9c3a4561 badn't config 2022-11-21 14:07:27 -06:00
petrak@ aecf017b06 fix conflicts 2022-11-21 12:20:56 -06:00
petrak@ 138580cbf5
Merge pull request #298 from ChuijkYahus/main
Update zh_cn.json
2022-11-21 11:23:51 -06:00
petrak@ a43ead40d6 wall scrolls don't look like they were drawn with tank treads anymore 2022-11-21 11:17:16 -06:00
petrak@ 9a276c70de clip the end of the pattern line in certain cases for visibility 2022-11-20 22:38:35 -06:00
petrak@ ef176058ea fix #309 2022-11-20 21:36:55 -06:00
petrak@ 2878dcb0c1 close #280 and reduce conformity 2022-11-20 21:07:33 -06:00
petrak@ f4bc787551 re #280, use indexing instead of iterator abstraction 2022-11-20 20:15:33 -06:00
petrak@ 220ac8bcab re #280, upload things to the GPU in bigger chunks 2022-11-20 19:59:00 -06:00
ChuijkYahus 6cdb34efbb
Update zh_cn.json 2022-11-21 07:45:52 +08:00
ChuijkYahus 85dca3d6f4
Merge branch 'gamma-delta:main' into main 2022-11-21 07:44:45 +08:00
petrak@ e535938368 nerd emoji (close #300) 2022-11-20 16:14:36 -06:00
petrak@ 9376632128 close #299 2022-11-20 16:12:09 -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
ChuijkYahus 52726ba522
fix 2022-11-21 00:53:06 +08:00
ChuijkYahus 5956ad38d5
Update zh_cn.json 2022-11-21 00:42:56 +08: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
ChuijkYahus cbeeb47705
Merge branch 'gamma-delta:main' into main 2022-11-16 11:32:13 +08: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
ChuijkYahus b64ae8131b
fix stray list macros in en_us 2022-11-16 10:51:03 +08:00
ChuijkYahus 82902aaa3b
fix 2022-11-16 10:44:45 +08:00
ChuijkYahus fcd76cf32c
update to fit en_us in main branch 2022-11-16 10:28:29 +08:00
ChuijkYahus fd1e190d09
Merge branch 'gamma-delta:main' into main 2022-11-16 10:08:16 +08: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 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
ChuijkYahus ee6f57d584
mana -> media 2022-11-11 17:35:55 +08:00
ChuijkYahus eb9a8464bd
fix location names & typesetting & readability 2022-11-11 16:59:14 +08:00
ChuijkYahus c76513d612
kinda finish 2022-11-11 15:24:42 +08: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
ChuijkYahus 9d45018053
more to come 2022-11-10 01:09:16 +08:00
ChuijkYahus a1b0602ad5
Update zh_cn.json 2022-11-09 13:11:35 +08:00
ChuijkYahus 091a79e677
Merge branch 'gamma-delta:main' into main 2022-11-09 12:04:20 +08: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
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
ChuijkYahus 2398d7e3f1
Update zh_cn.json 2022-08-30 12:09:43 +08:00
ChuijkYahus aca1fa905a
Update zh_cn.json 2022-08-30 11:46:20 +08:00
ChuijkYahus 42ae3df0ba
Update zh_cn.json 2022-08-30 11:44:17 +08: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
ChuijkYahus efc506b79c
Update zh_cn.json
Updated to match en_us in main branch
2022-08-29 22:50:22 +08:00
ChuijkYahus 2d71b73b33
Merge branch 'gamma-delta:main' into main 2022-08-29 22:13:05 +08:00
ChuijkYahus 497f1df23d
Delete vectors.json 2022-08-29 22:11:39 +08:00
ChuijkYahus 104f80c9eb
Update zh_cn.json 2022-08-29 22:09:09 +08:00
ChuijkYahus 76b4121118
Update zh_cn.json 2022-08-29 15:33:44 +08:00
ChuijkYahus 4544d5f479
Update zh_cn.json 2022-08-29 15:25:20 +08: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
yrsegal@gmail.com c41ad80907 plural of dust is dust, sometimes
it's a weird case of an uncountable word
2022-08-28 22:14:18 -04:00
yrsegal@gmail.com d9a59830c8 fix a couple of inconsistencies in patchi book 2022-08-28 22:13:19 -04: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
ChuijkYahus 1bb85cb683
Update zh_cn.json 2022-08-28 16:44:50 +08:00
yrsegal@gmail.com 25fea447a5 fix selection of items for placing being weird 2022-08-27 09:11:19 -04:00
ChuijkYahus e7068c60cb
Update en_us.json 2022-08-27 12:05:13 +08:00
ChuijkYahus feece73908
Create vectors.json 2022-08-27 12:03:51 +08:00
ChuijkYahus 867b04966f
Update book.json 2022-08-27 12:03:04 +08:00
ChuijkYahus afb06ddcc1
Create zh_cn.json 2022-08-27 12:02:27 +08: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 63be2d9a96 fix annotations not compiling 2022-08-18 17:18:16 -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 1dcc3bc293 add icons for edify and phial in EMI
edify is just world interaction, but dani couldn't really come up with a good looking sapling
2022-08-10 07:05:39 -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 b34d676afb fix #206 2022-08-02 18:58:53 -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