github.com/Layers-of-Railways/Railway commits

Finish up smokestacks

a12857af0330eb27e3f3605eb89c3e59eff00c53 authored almost 2 years ago by techno_sam <[email protected]>

Smokestacks almost done: waiting for recipes

7597b01f04b20549e0cb66ca0460e1ac7669f4d7 authored almost 2 years ago by techno_sam <[email protected]>

Smokestack progress

1a3fce3e447b72c37c47c01a875931778e4345ac authored almost 2 years ago by techno_sam <[email protected]>

add missing lang entry for whistle success

5cf1ea26385491514bdeeeb9dc6e9edb9f9bd074 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Fix transforms on turtle hat

8b5026fdc44e7e581d2a1036af348b96c0a37875 authored almost 2 years ago by techno_sam <[email protected]>

Merge pull request #63 from Layers-of-Railways/1.19/smokestack

codeless smokestack

b764d55be810329ade5a005f64b74a12d1bcb20b authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #62 from Layers-of-Railways/1.19/coupler-sprites

1.19/coupler sprites

d304a99d88feb140ddc071df670b0fd9eeedb3b9 authored almost 2 years ago by techno-sam <[email protected]>

Add more of Toopa's art

dbec8e27402a0e4455415efaae37a9a48e2937fa authored almost 2 years ago by techno-sam <[email protected]>

Add SpottyTheTurtle hat

486d19dc17826649445b8e5e772f42a4ea48767c authored almost 2 years ago by techno_sam <[email protected]>

Custom dev hats

677556c58e1545d1d44b139f094eb42bf7da83d4 authored almost 2 years ago by techno_sam <[email protected]>

Conductor whistle craftable

8b47f643c157f283d4f8308d1c68caccddd1a5a8 authored almost 2 years ago by techno_sam <[email protected]>

Datagen

743ef2a33c5e66f552c90a84502cf4505f9ae007 authored almost 2 years ago by techno_sam <[email protected]>

Merge pull request #60 from Layers-of-Railways/1.19/coupler_improvements

1.19/coupler improvements

224e4d56d6b1bf5eba88831df37a5889cb8452ed authored almost 2 years ago by techno-sam <[email protected]>

Merge branch '1.19/dev' into 1.19/coupler_improvements

32298cc1d373da0034f416ec3aabc07caab01227 authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #59 from Layers-of-Railways/1.19/whistle

1.19/whistle

8e4f14dc7ca3d18850cc2a8c9e30113d6559d551 authored almost 2 years ago by techno-sam <[email protected]>

Merge branch '1.19/dev' into 1.19/whistle

c17ce8d2d8dab4353d99a55ce9815768118a2604 authored almost 2 years ago by techno-sam <[email protected]>

conductor's whistle block finished

7bf23f0071ddb45c2803d2472f07d5867c605443 authored almost 2 years ago by techno_sam <[email protected]>

Merge pull request #58 from Layers-of-Railways/l10n_1.19/dev

New Crowdin translations by Github Action

bffecc38c37b3c360e8cdaf4b82a9d0233bc19bd authored almost 2 years ago by techno-sam <[email protected]>

New Crowdin translations by Github Action

135f8c6811c77249cc14db498f9d78c7e0a6f5be authored almost 2 years ago by Crowdin Bot <[email protected]>

Update localization.yml

6b437ccf777b9464df3be1abb1b6384987c708c4 authored almost 2 years ago by techno-sam <[email protected]>

Create localization.yml

c651ce5486d7ec5c0a8ad5bf5f0d60f7cb72e20c authored almost 2 years ago by techno-sam <[email protected]>

Update crowdin.yml

853c3e5e4b37526ef34dc77f7efcf12626327322 authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #57 from Layers-of-Railways/l10n_1.19/dev

New Crowdin updates

af4d6fb9c3aa6c5573f753ac3432dc20270dc399 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Korean)

0f65a4f72a5ec6a40daa67693a626dce5e5b14ca authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (German, Austria)

d1811443ed815a826d86e6d7abe32eb17843c125 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Polish)

99ae5b03701b357035701106a3aa37a6399d3cab authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Chinese Simplified)

9966a7912407f87a1743f17c765a2702a92a6d2d authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Dutch)

74efde4bbef8894c195fd00f09637ce3ea43c929 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Korean)

fbedd1f84bb85d1bafb2931149e8f6ece800b47a authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Japanese)

7a0df31ac48cf65d9769ccdef071a1c23c6f6efe authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (German)

5c746ca63903e7f7aca0b0bc6b1f9b07f981ab00 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Spanish)

ff4d2eaa263b98a86d1489cba1dc55071f308cd5 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (French)

7b682c92c7700d0ba429f34f07f1d85c9bc24d3a authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #42 from Catchmons/1.18/dev

update chinese translation

b802ebeba4b24a9dc21beb8f2c4b43c753370b90 authored almost 2 years ago by techno-sam <[email protected]>

Merge branch '1.19/dev' into 1.18/dev

7730dc6c59afaf4fb132b1d3540b693c5429d61a authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #52 from muriplz/1.19/dev

Updated es_es.json

47b8a0f425b427647d23878eaebcd956b549c94d authored almost 2 years ago by techno-sam <[email protected]>

Merge branch '1.19/dev' into 1.19/dev

e40674c6acb3a233fbba0d0c9f30a00c91a1479c authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #53 from TiesToetToet/TiesToetToet-patch-3

More NL_NL Translations

31cf9f279c761ad42fd8b5d07a369860a2c65189 authored almost 2 years ago by techno-sam <[email protected]>

Merge pull request #55 from Layers-of-Railways/l10n_1.19/dev

New Crowdin updates

3df43b684eec714485717f3b2fbd2e41b156bd3d authored almost 2 years ago by techno-sam <[email protected]>

Update gradle.yml

7674c867b2dd5304ab80e682de407247dcdf9805 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (German, Austria)

f2991ce679ac4efbb06ea85fdb28ff355c6e1d79 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Chinese Simplified)

c7af4edf8f1e856b5c825c247a80b49d99f8604f authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Polish)

c39df7971f9d85ae32fba0c5c671583c874c1380 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Dutch)

3bc9655cf64cd193ac3e3c6f6239353a9f62ead8 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Korean)

f941e1e6166cab83c2d8ff6875859b6a0a9e96d9 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Japanese)

9ddd141154d920b2e77c6d0520f5382306a85c9b authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (German)

e2d6848bb19c9d6d41b484ac92a1c7ca9cb4bfd4 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (Spanish)

a9e483a0c988a6534b906149bb40bba44fc7dc31 authored almost 2 years ago by techno-sam <[email protected]>

New translations en_us.json (French)

49131018adc050bcde69b9011edc87b0824fd83d authored almost 2 years ago by techno-sam <[email protected]>

Update Crowdin configuration file

6db67ae4d5ab4e665b752df99de12edadf7a0b1a authored almost 2 years ago by techno-sam <[email protected]>

Conductor whistle improvements

b22a1580eb63d7cd1110636c1545371dc14482ce authored almost 2 years ago by techno_sam <[email protected]>

Conductor whistle progress

9b0f8b1c3d64839d9af9517975e56bebef4359ce authored almost 2 years ago by techno_sam <[email protected]>

Update nl_nl.json

7ae29056e2ceb61b1154fdf3e3832016886ef496 authored almost 2 years ago by TiesToetToet <[email protected]>

Merge pull request #1 from TiesToetToet/TiesToetToet-patch-2

Update nl_nl.json

20b32cffb44b35d891c075c5da0e8b6f7d6020e4 authored almost 2 years ago by TiesToetToet <[email protected]>

Update nl_nl.json

194362d37097b5b3778b3c529dabfe693cc54601 authored almost 2 years ago by TiesToetToet <[email protected]>

Update nl_nl.json

2f2ed7263094995496ce274095eb6a64e327e900 authored almost 2 years ago by TiesToetToet <[email protected]>

Merge branch 'Layers-of-Railways:1.19/dev' into 1.19/dev

08d8b8572a3301de7ddb325fc2e2404a22a01b30 authored almost 2 years ago by TiesToetToet <[email protected]>

Conductor whistle progress (need textures, models, and lang files done)

100704b1acb140b806b974ac412966ec906ff18c authored almost 2 years ago by techno_sam <[email protected]>

对 nightly 版本中的新内容进行了翻译

39d9be85495a259cf8c56284c8a696f6710c13fa authored almost 2 years ago by Catchmons <[email protected]>

little fix

8b46c3d00112566c53eb5bec7ca7c33a4f3f357b authored almost 2 years ago by muriplz <[email protected]>

Commit to resources folder

676daa157c20c82b21700b40190d261d9f8f95f5 authored almost 2 years ago by muriplz <[email protected]>

Update es_es.json

- Translation made by @AndreSkGH , and revised by me.
- Commit to generated folder to see changes

baec95653e7c87f4ec0c388bea617256050df395 authored almost 2 years ago by muriplz <[email protected]>

codeless smokestack

added smokestack models and textures, no code. Mostly just a test to try to understand how githu...

a534473cf61a9473f3b84afa8e28ba950868a2fa authored almost 2 years ago by RileyHighline <[email protected]>

Improve station screen mixin

8891855eb646e261c7f83f94d295c3fdfd64da5d authored almost 2 years ago by techno_sam <[email protected]>

Improve station screen mixin

13fe620424a863af54677b7f4c2f34c8ab46b254 authored almost 2 years ago by techno_sam <[email protected]>

Fix the actual bug

3d0e4cc2f3ebb45221d0043d28b9023586e9b2a4 authored almost 2 years ago by techno_sam <[email protected]>

-minor changes, just setup to cancel the request if the player shift right clicks while a train is on its way.

40ba564738d8eaef5186ebc1872c4482a90d7a23 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Yet another mixin fix

7b16dd0aef2224d9f0fff4ab7fcaf76fa57bdf64 authored almost 2 years ago by techno_sam <[email protected]>

Fix mixin - whoops

83d3d89d01fb031ef8547fdfe561d7898edf50fb authored almost 2 years ago by techno_sam <[email protected]>

Add sliding door options

0662391e8ee9ef0e638de743e5dd3a18c0813451 authored almost 2 years ago by techno_sam <[email protected]>

Add semaphore to broken by axe, make monorail relocation visible

[ci skip]

b649d6e7fe1bda0d8ad1edd71251fcf49a45c596 authored almost 2 years ago by techno_sam <[email protected]>

QOL improvements:

Add blue connected glue overlay on CTRL + hover
Add station limit - prioritize pathing to matchi...

d07f3d9bb786c430f717b0cda11907d73135fbae authored almost 2 years ago by techno_sam <[email protected]>

Fix some mixin mapping problems

d0ac1df2411ba6519bf645575a1086ff0871b834 authored almost 2 years ago by techno_sam <[email protected]>

Fix static block rendering

d64a082a3d7c4c1cc1a87c77a79ee07903f043a3 authored almost 2 years ago by techno_sam <[email protected]>

And rendering fixed up

1a417438727f0b4c19e8630877aa7fec1fda7c8a authored almost 2 years ago by techno_sam <[email protected]>

Fix all the monorail bugs (hopefully)

0f62e88d2e73f1fe194d5e999f6a3703b2ad5468 authored almost 2 years ago by techno_sam <[email protected]>

Fix bogey spacing between hanging and nonhanging

TODO: fix non-instanced rendering

d654552e3c6299d724b37c13af8906badee83179 authored almost 2 years ago by techno_sam <[email protected]>

Fix up hanging bogeys

086de5c9906ce6c0ee03ef0abf24e4fea596fe76 authored almost 2 years ago by techno_sam <[email protected]>

try an alternative approach to the previous commit's idea.

-still not working and would appreciate someone who knows a bit more taking a look over it but it...

3a041dd4bcb236da2e02cbf82c6c7e1171728e1b authored almost 2 years ago by SpottyTheTurtle <[email protected]>

added line to register new station, still need to figure out how to pass the proper info to it.

cfe485467ce99be8330dc5c8f24e683721c69665 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Fix mixin side

e9436590c795f6a27f31967afd0e6d68f32ebaf0 authored almost 2 years ago by techno_sam <[email protected]>

Fix monorail selection

14b9574acd11f418842db1afc02268de0d8e8945 authored almost 2 years ago by techno_sam <[email protected]>

添加红树列车轨道的翻译

abfd942005740126e2b0a48fd06b39e1ac015ce0 authored almost 2 years ago by Catchmons <[email protected]>

Remove unnecessary debug

ad4505c9e3b753b0e97d424d0131ea096b2cee64 authored almost 2 years ago by techno_sam <[email protected]>

Hanging monorail bogey complete

f27f45ef70d062d48f14a84ff6b571f02e8b4210 authored almost 2 years ago by techno_sam <[email protected]>

-monorail hitboxes now work

-only issue is that they also render the normal track hitbox as well as the monorail one
-oh and ...

768dcb6c2e016c8a6644cf36b5dc55dfd2ffa7a1 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

-try to fix monorail hitboxes

-MixinReplaceTrackCheck doesn't seem to be working even though making monorailWalkShapes/walkShap...

1687731591dcebf6fd0beff900e84138a86333a9 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

-fix monorail textures

-attempt to get proper selection hitboxes for the monorail track working.

4467aff467f102b19ec6492e39aea2bdbca16883 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Add normal monorail bogey, begin work on hanging monorail bogey

f061b9cea6f8e1842c61438a840d272edf4ba023 authored almost 2 years ago by techno_sam <[email protected]>

Journeymap compatibility

0ff6f1c419b1a4d88cc62e48e7b4498f2f544e3f authored almost 2 years ago by techno_sam <[email protected]>

fix the mixins so Railways actually works with patch H, it's throwing a weird error but it doesn't appear to be causing any major issues so I'm leaving it alone for now.

69548b9534bb1c9227fc6ff746c135413016783d authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Revert "Merge pull request #49 from Layers-of-Railways/1.19/dev"

This reverts commit 67791364e7f6ccace684ceacde15784c19fc08ad, reversing
changes made to ae1a00fb...

8c3f39d77b7a243683e9d078b258443e870941e2 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Updated the coupler sprites with art from To0pa#0001

0fcfc58182062a1bb62ed49481962ff5c96d1a7d authored almost 2 years ago by Violet-Scarelli <[email protected]>

Merge pull request #40 from BluePhi09/patch-5

Finished Localising de_at

5f6957819a8ed9f9ab43c97d74cdc8f15b3d0218 authored almost 2 years ago by Violet-Scarelli <[email protected]>

Merge pull request #49 from Layers-of-Railways/1.19/dev

Merge 1.19 changes into 1.18

67791364e7f6ccace684ceacde15784c19fc08ad authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Revert "Merge branch '1.18/backport' into 1.19/dev"

This reverts commit a22e2232cbd04e4358340fe071f23034b348f073, reversing
changes made to 3121ef64...

1cb2a8286660f061f2d11d854c1e3c3670d831f7 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Merge branch '1.18/backport' into 1.19/dev

a22e2232cbd04e4358340fe071f23034b348f073 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

fix the mixins so Railways actually works with patch H, it's throwing a weird error but it doesn't appear to be causing any major issues so I'm leaving it alone for now.

3121ef64fe50505452cc3d736f2031fa0d0fc5e3 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Merge remote-tracking branch 'origin/1.19/whistle' into 1.19/whistle

# Conflicts:
# src/main/java/com/railwayteam/railways/content/conductor/whistle/ConductorWhistle...

0f7875dc1cc3c70966c44f1c505505e3e93b0fda authored almost 2 years ago by SpottyTheTurtle <[email protected]>

whistle sound now actually works

-now works with all rail types

64fadc2e58659d599a4320efa5624c7a91fef848 authored almost 2 years ago by SpottyTheTurtle <[email protected]>

Ecosyste.ms: OpenCollective

github.com/Layers-of-Railways/Railway