-
Notifications
You must be signed in to change notification settings - Fork 7
Create Bits 'n' Bobs: Compat 'n' Casings #45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
216 commits
Select commit
Hold shift + click to select a range
9084d48
I am telling you i have plans that i cannot share with you rn cause t…
cakeGit 73ff0de
Girder struts can be appropriately wrenched to break them
cakeGit 0a79004
Use named location instead of explicit
cakeGit 1c85d3e
Belt experimentation
cakeGit b5bfa46
Glowie
cakeGit b0c6ad9
Encaseable piston poles
cakeGit 8890278
Creative tab fix
cakeGit 85924c0
Ponderflat world settings (start, no actual settings yet)
cakeGit cc227b0
Finished piston pole encasings,
cakeGit 5f3e949
Refactoring
cakeGit 80f5f19
Merge branch 'main' into compat-and-casings
cakeGit 5d6048d
COGWHEEL CHAIN API AND BELT COGWHEELS RAHH
cakeGit a1348af
Proper item returns, started rope type
cakeGit 1407adc
Cogwheel rope
cakeGit e5e5110
Merge branch 'main' into compat-and-casings
cakeGit 46b08a3
Re data gen after 0.0.40 merge
cakeGit 3241aa0
Merge branch 'main' into compat-and-casings
cakeGit 0146f14
Reapply weathered girder
cakeGit b724afe
Hopefully safe gradle
cakeGit 995e8a5
industrial grating
cakeGit 2833e69
Grating panel ct fix
cakeGit 1c6085e
Started truss pending assets
cakeGit 9ebf5ce
alternating truss
cakeGit 042f675
Working alternating truss model
cakeGit d6706a0
Improved belt chain, fixed shear issue in rendering, fixed chain driv…
cakeGit 5b49d3d
stopped disabling chain hand swing for some reason
cakeGit 415215f
Belt drive
cakeGit b57ef16
Started work on encased chain drives :D
cakeGit 4972f0c
encased block somewhat working
cakeGit cf3377d
Reorganized creative tab
cakeGit e63e9ec
me when i FIX STUFF
cakeGit fff70af
chain rope fixed too
cakeGit a7d3d70
ohh im updating my assets ohh
ShitFlinger f5a1107
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
ShitFlinger 3f09553
updated a LITTLE bit of models
ShitFlinger df77fea
Throttle lever starting work
cakeGit a51a76e
nixie stuff is shaded now
ShitFlinger 174b369
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
cakeGit c992e37
tottle shaft
cakeGit 4fdbd1f
wooden girder
ShitFlinger 3e48fce
Headlamp cc compat- doesent work on flat planes gotta fix
cakeGit 96a6828
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
cakeGit 336c212
fix
cakeGit 31ab573
Significant streamline of headlamp update queing, idk about rendering
cakeGit 4d11222
Render optimisations
cakeGit 3d663f4
strut max distance is 30 + added cable struts (feel free to remove)
ShitFlinger b61f017
updated some assets
ShitFlinger 01f07c5
Initial plan
Copilot 80aefb9
Fix headlamp rendering concurrency issues
Copilot e8a510b
Improve state merging in HeadlampQueuedOperationHandler
cakeGit 30949f4
Merge pull request #67 from Industrialists-Of-Create/copilot/review-h…
cakeGit 67d06a6
Initial plan
Copilot 8f84343
Transition headlamps to cached VertexBuffer renderer
Copilot e4fee56
Address code review: improve eviction efficiency, add DYE_COLOR_OFFSE…
Copilot cc4722e
Update comments in HeadlampBlockEntity.java
cakeGit 4962f2f
Extract shared constants to HeadlampConstants, rename getCCAddressing…
Copilot eac1e19
Fixes to rendering to make it like, work
cakeGit 08dd043
Update HeadlampBlockEntityRenderer.java
cakeGit 89d1ed0
Started instancing
cakeGit c6a05ea
???
cakeGit 25b4401
Final fixes
cakeGit fe3c3ce
Bapple processing
cakeGit b700861
Headlamp queued ops packet for better bulk updates
cakeGit 66f6378
Translucent casue more performant
cakeGit 8c8fc6f
I remember why i dont use translucent
cakeGit 34dbb05
Delete src/main/java/com/kipti/bnb/content/decoration/light/headlamp/…
cakeGit 1569a04
Update .gitignore
cakeGit 12219c1
Address review: config for CC range, move material to BnbMaterials, s…
Copilot 1a8ffac
Update CC peripheral range to use block-based config with proper head…
Copilot 1dbeea3
Update .gitignore
cakeGit 9234cbc
Merge branch 'copilot/transition-headlamps-to-cached-renderer' of htt…
cakeGit 3666ff3
Revert "Update .gitignore"
cakeGit 3a6a391
stufff
cakeGit 4305a62
Chain interactions started
cakeGit 07a42f1
Merge pull request #68 from Industrialists-Of-Create/copilot/transiti…
cakeGit 2089a38
Cleanup refactoring
cakeGit 699b420
effects arte back and chunkier boxes
cakeGit 5080e59
maybe fixed
cakeGit 1fbaf2e
Merge branch 'compat-and-casings'
cakeGit 6b62fc8
Merge branch
cakeGit e838248
Merge pull request #71 from Industrialists-Of-Create/compcasingsmerge…
cakeGit 0d7b2e9
✨ Truss Placement Helper and Cogwheel Chain Config
AstralButOnGitHub 604a017
Revert "✨ Truss Placement Helper and Cogwheel Chain Config"
AstralButOnGitHub bea5c40
me when i strucutre ts
cakeGit 9ba7e69
me wgeb no structure yet
cakeGit b059b0c
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
cakeGit 240588a
strucutre
cakeGit e635a80
Moved chairs back to main
cakeGit 50cd27c
fix dyed block feature flags
cakeGit beaeeab
Started super block entity behaviour refactor
cakeGit 4dd86d7
Super block entity refactor II (game runs)
cakeGit 71d3cf3
FINALLY IT LOADS
cakeGit 0cf4d2c
Revert project code style
cakeGit 997f2eb
Started work on wrapping chains and chain drive instances
cakeGit 9e868a7
Light visual (ai slop to fix)
cakeGit 743d8a0
Update src/main/java/com/kipti/bnb/foundation/ponder/instruction/Conv…
cakeGit 1cd8345
Update src/main/java/com/kipti/bnb/foundation/ponder/instruction/Conv…
cakeGit 30dbfa1
Cleanup, removed renderer wrappers
cakeGit a29453f
??? and block breaking
cakeGit 86e8a00
and now, the end is near...
cakeGit 3533f80
Crash fix
cakeGit 12c64f3
Temp improved placement effect and fixed kientics
cakeGit 5cdd0d8
Tweaks to cogwheel logic, fixing cogwheel shape collisions, adding ad…
cakeGit 0371a36
Improved cogwheel partial display
cakeGit c66543a
Flanged gear sapees
cakeGit 1fae5ab
Chain data migration (i think
cakeGit f1c8ade
Chain migration almost done (one pending fix)
cakeGit 4b3ef87
Finished mgiration system (with some shameful methodology)
cakeGit 49da4ea
Merge pull request #72 from Industrialists-Of-Create/chain-drive-rest…
cakeGit 20153d9
Update BnbDecorativeBlocks.java
cakeGit 5572a1f
ohhh I'm grating' it ohhhhh
AstralButOnGitHub 1cdf938
Girder strut collision poking around
cakeGit cb29adb
Girder strut collision shapes done i guess
cakeGit b63e91c
Blocked straight up/down due to just everything being kinda wonky
cakeGit f0ddf82
Merge pull request #74 from Industrialists-Of-Create/girder-poking-ar…
cakeGit 2171386
Strut shapes
cakeGit d898f27
Remove outdated utils
cakeGit fd7a867
Move azimuth to dedicated lib
cakeGit ba447be
Move azimuth mixins
cakeGit cb2033c
Move girder struts to new library
cakeGit 02a8c98
Fully setup seprate libraries for azimuth and struts
cakeGit 4802162
Remove unnecassary logging
cakeGit a199cbb
Datagen fix
cakeGit 59c4ed7
y
cakeGit 33f37d3
I may not know how to operate github
cakeGit 8e2a587
Fixed up final issues and completed dye work
cakeGit 63038a8
Fuck my Chud Fucking Life
ShitFlinger 0a2728b
Update FluidPipeBlockMixin.java
cakeGit 79550bb
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
cakeGit 67565d3
FUCK
ShitFlinger 93af050
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
ShitFlinger 85498bb
Pipe placement dying desync elimination!
cakeGit 98bb99e
Glass fluid dyed pipes
cakeGit 604d72b
Dyed pipe ponder, started chain ponders and fix chain render bug
cakeGit 1b79ca1
Cogwheel chain ponders
cakeGit eef98bf
Update CogwheelChainScenes.java
cakeGit e872789
im tweaking it
cakeGit b7033ca
tweaking II
cakeGit 05e0b21
Take out nixie changes from articulate branch
cakeGit de5f4bb
Ponderflat config screen
cakeGit 6e553a5
pipe ponder tweaK
cakeGit 8e0c33d
Ponder NEW hint
cakeGit 34fd5d1
Cable polishing I
cakeGit ee226c9
Cable polishing II
cakeGit b94a1f0
Git test / remove unuse constructor
cakeGit c13fdee
Added industrial panel encased shaft
cakeGit 90ea789
Ponder hint
cakeGit d0385b7
Merge pull request #77 from Industrialists-Of-Create/pondermicrofont
cakeGit 69e05e1
Ponder hint
cakeGit ea90e36
Ponder hint but able to be localised, when i localiose lol
cakeGit 7055170
Merge branch 'compat-and-casings' of https://github.com/Industrialist…
cakeGit 67c186b
Industrial panel is EVIL
cakeGit cd460b0
Fix CogwheelChainAttachmentHelper structure and out-of-scope docs
cakeGit 9736347
Delete LevelChainShapeStore and gut old shape tracking system
cakeGit 8516195
Started cogwheel chain carriage
cakeGit f0873e4
ough im chainc arriging it
cakeGit 35b6cb9
Ive fixed it
cakeGit 3910e41
Ive fixed it
cakeGit 986947a
Update gradle.properties
cakeGit 852e801
Ive fixed it
cakeGit 2cd8c61
Improved networking
cakeGit da447c3
Carriages not being super bad
cakeGit eebcb02
Added the rest of the missing chain riding code
cakeGit a7ef6f8
ok (unreveiwed ai slop
cakeGit 5a16496
added carriage asset
ShitFlinger d79c724
udpate
ShitFlinger 11ae23d
Merge branch 'contraptions-and-control' of https://github.com/Aztech-…
cakeGit c12cdf4
Merge branch 'contraptions-and-control' of https://github.com/Aztech-…
ShitFlinger 86c943e
Crug and Booby
ShitFlinger e3f4ce4
SOLVED THE DESYNC IM JUST COGNITIVE DECLINE
cakeGit 5f9467c
Riding and partial editing slop to inspect
cakeGit b4b3a90
Ok desync banished to the shadow realm for real fro real on god
cakeGit 8f94b33
Fixed unnecassary rotation and mvoement on assembly
cakeGit b370eb4
Cogwheel partial placement not s*** (Reviewed ai slop)
cakeGit e3dd225
"Funt" said the Dealer
ShitFlinger a5881ae
Merge branch 'contraptions-and-control' of https://github.com/Aztech-…
ShitFlinger 540b4fe
FIXed the FUCKING DFYED PIPES FUCK
ShitFlinger f9edd24
things
cakeGit a9d760a
Merge remote-tracking branch 'origin/contraptions-and-control' into c…
cakeGit 53d54bd
FIXED chain drive behaviour
cakeGit f686e4e
Started truss based encasing
cakeGit 24da6f5
Kiptis good chain carriage
cakeGit 3856595
Trussing
cakeGit 8a582fa
Merge branch 'contraptions-and-control' of https://github.com/Aztech-…
cakeGit fc598a7
Way better truss and ggrating handling
cakeGit 992f89e
Started fluid tanking it
cakeGit 96ae8cb
tanking it
cakeGit 362d813
Update FluidTankItemMixin.java
cakeGit c3589ac
feat: add TILES feature flag conditions to all palette/tile recipes
cakeGit 65f6803
feat: add feature group bulk toggle entries to common config
cakeGit f00215e
Code cleanup dyed tank ponder, redid feature flag system for awesoemn…
cakeGit 5f5ceac
Better ponder lang
cakeGit 9f622ab
Merge pull request #80 from Aztech-Modding/feature/dyed_tanks
cakeGit 3a90b85
collisoin fixe Where am I Fuck Help Me Helpp Hellp
ShitFlinger b71fccd
Better item modesl for bearing and carriage
cakeGit 8d76541
The woke adgenda
cakeGit 81e5a8a
GIGANTIC COGWHEEL MODEL + TEXTURES ADDED. FUCK. OH MY GOD. THIS WAS H…
ShitFlinger b861482
i think i tried to start on the texture swapping, it doesnt owrk. sor…
ShitFlinger 3ce9e76
fucking Fuuuck Fuuickk owwww Fukckkkk
ShitFlinger 3eebf68
Gay agenda comlete: pronouns mandatory
cakeGit 0f49614
Merge branch 'contraptions-and-control' of https://github.com/Aztech-…
cakeGit ee80cf4
its . flanged cogwheel. thats what this file is. Fuck. Damn
ShitFlinger 654e277
Fix dyeable transitions for that one specific case
cakeGit ec3d64d
Awesome gigantic gogwheel block tweaks
cakeGit cf948b3
Merge branch 'contraptions-and-control' of https://github.com/Aztech-…
cakeGit a9c8ffc
Fixing item models
cakeGit 6d437f1
Fluid dying advancement
cakeGit 29ed588
disable feature flag locks for some content
cakeGit d90f21c
feat: Add TrussEncasedPipeBlock for fluid pipe encasing in industrial…
cakeGit 61078c5
Strut ponders, started pipe encasing for trusses and panels
cakeGit 575ace9
fix up pipe bs, partially
cakeGit 01c3225
Awesome throttle lever handling
cakeGit cec4636
Remove legacy kinetic handling
cakeGit 92d5bbf
Lang defaults system from azimuth
cakeGit 67ad749
Update ChainInteractionFailedException.java
cakeGit 726eb57
Merge pull request #81 from Aztech-Modding/contraptions-and-control
cakeGit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Negation of subdirectories of an ignored parent has no effect — the new
.ideafiles will not be tracked.Git stops recursing into a directory once it is ignored. Because
.ideais already listed on line 16, the!.idea/codeStyles/and!.idea/inspectionProfiles/exceptions on lines 19-20 are silently ignored by Git. ThecodeStyleConfig.xmlandProject_Default.xmlfiles added in this PR will therefore never be staged or committed.The fix is to replace the broad
.idearule with explicit per-entry ignores for everything inside.ideathat you do want to exclude, and then let the subdirectories you want tracked fall through naturally:🔧 Proposed fix
Changing
.ideato.idea/*ignores the contents of the directory without ignoring the directory itself, which allows Git to honour the subsequent negation rules.🤖 Prompt for AI Agents