petrak@
|
697450dd66
|
woot woot! fix bad maven deps and improve perf on colorizers
|
2023-04-27 14:26:15 -05:00 |
|
petrak@
|
846ef5b58a
|
ok THERE's the merges
|
2023-04-24 12:13:41 -05:00 |
|
petrak@
|
954f8918ae
|
merge in talia's fix? hopefully?
|
2023-04-24 11:38:03 -05:00 |
|
Talia-12
|
fa8d109403
|
fixed things to the point that it actually compiles and runs.
|
2023-04-15 21:32:58 +10:00 |
|
Talia-12
|
a51aead089
|
removed unused methods from BlockEntityStoredPlayerImpetus, fixed sentinel now being nullable, and using null to indicate no sentinel.
|
2023-04-15 21:31:48 +10:00 |
|
petrak@
|
fae9a2eecd
|
bang on #419. i'm half-convinced this is a bug in fabric events now?
|
2023-02-24 11:22:56 -06:00 |
|
petrak@
|
9a231a634b
|
waluigi
|
2023-02-18 19:19:49 -06:00 |
|
petrak@
|
a501f774c3
|
i've been patching up the harness, all the live-long day
|
2023-02-18 17:53:27 -06:00 |
|
petrak@
|
ca5ccf60f6
|
merge from main
|
2023-02-18 17:21:35 -06:00 |
|
petrak@
|
237e75e6da
|
wowza what a texture
|
2023-02-17 21:44:16 -06:00 |
|
petrak@
|
e44892389c
|
this isn't working
|
2023-02-17 20:56:39 -06:00 |
|
petrak@
|
74690580f6
|
woo, altiora works on fabric and forge
|
2023-02-17 19:30:41 -06:00 |
|
petrak@
|
cefd9439db
|
ex altiora
|
2023-02-17 18:06:12 -06:00 |
|
petrak@
|
e23d2a3da1
|
better flight
|
2023-02-17 14:11:16 -06:00 |
|
petrak@
|
24367669e5
|
aaaaaugh. also document things
|
2023-02-04 11:35:26 -06:00 |
|
petrak@
|
117fbfb781
|
why couldn't i leave well enough alone
|
2023-02-03 11:22:21 -06:00 |
|
petrak@
|
e37d08d81e
|
compiling is a myth invented by big code
|
2023-02-02 13:05:47 -06:00 |
|
petrak@
|
8b0a01e825
|
close #378
|
2023-01-21 20:29:09 -06:00 |
|
petrak@
|
4010ea6d9e
|
move more things
|
2023-01-21 17:35:41 -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@
|
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@
|
949e4bb292
|
fix #325
|
2022-11-29 15:24:44 -05: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 |
|
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 |
|
yrsegal@gmail.com
|
61e292af10
|
finish mana -> media
|
2022-11-09 19:50:37 -05: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 |
|
gamma-delta
|
d148552a81
|
*now* it's compiling, at least on forge
|
2022-11-04 17:31:18 +01:00 |
|
yrsegal@gmail.com
|
1d6bb87864
|
Close #123
|
2022-10-01 12:52:37 -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
|
4ed6f299e7
|
trinkets/curios integration
|
2022-07-25 10:56:23 -04:00 |
|
yrsegal@gmail.com
|
549d6f685c
|
Fix #136
port of 1b01174186
|
2022-07-24 20:07:09 -04:00 |
|
yrsegal@gmail.com
|
1b01174186
|
fix #136
|
2022-07-02 23:23:28 -04: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
|
a9c8be1212
|
still doesn't compile, but now feat. registries
|
2022-06-13 01:39:12 -05:00 |
|
yrsegal@gmail.com
|
b25cffd814
|
some minor tag changes
|
2022-06-07 19:22:09 -04:00 |
|
yrsegal@gmail.com
|
28404a6593
|
emi!
|
2022-06-07 19:22:09 -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
|
e61b5c1255
|
fix comparator output not showing on fabric
|
2022-06-04 10:24:31 -04:00 |
|
gamma-delta
|
bf35952778
|
lilliputian
|
2022-06-02 02:11:48 -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 |
|
gamma-delta
|
00e9340851
|
close #95 (it would have happened on both sides)
|
2022-05-30 15:31:46 -05:00 |
|
gamma-delta
|
f0472125ea
|
move to new paucal datagen
|
2022-05-26 09:15:56 -05:00 |
|
yrsegal@gmail.com
|
52b7036b91
|
nbt dsl, names are no longer wrongcased, ser for con frames
|
2022-05-24 23:35:36 -04:00 |
|
gamma-delta
|
9ccfba83f9
|
datagen that i havent tested at all
|
2022-05-23 17:01:22 -05:00 |
|