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

Merge branch '1.18/dev' into 1.19/dev

# Conflicts:
# DESCRIPTION.md
# common/src/generated/resources/.cache/cache
# common/src/generat...

c48d3b7be12efafa255f2a2c2c3f40a6e6d00f67 authored over 1 year ago by techno-sam <[email protected]>

fix maven name

3cda9e8de2a5a5ddbefe3716192f4a7ba41808ed authored over 1 year ago by IThundxr <[email protected]>

add maven publishing

74990e9a096263acab7a50406adb3139c55ecacb authored over 1 year ago by IThundxr <[email protected]>

fix maven name

530b4b139b2c34ebffef380e78cbc8ce602cd663 authored over 1 year ago by IThundxr <[email protected]>

add maven publishing

f766ce09c1d7c34864618310eede1ea110ea5397 authored over 1 year ago by IThundxr <[email protected]>

Digital Anti-Entomology part 2

Fix bugs

984639f81c45a47fc147639d4e4d0a2778634ff7 authored over 1 year ago by techno-sam <[email protected]>

Digital Anti-Entomology

Fix bugs

ea101f3ac3367956887816772e391ec226ada96f authored over 1 year ago by techno-sam <[email protected]>

Merge branch '1.18/conductor_morph' into 1.18/dev

# Conflicts:
# common/src/main/java/com/railwayteam/railways/content/conductor/ConductorCapModel...

ab6945506dac08be2108ba8415a668ccbafd47f1 authored over 1 year ago by techno-sam <[email protected]>

Easter eggs

77023bf8b44c87d71c355680fcbbb46db4de2c08 authored over 1 year ago by techno-sam <[email protected]>

Merge pull request #163 from Layers-of-Railways/1.18/thundxrconductor

Add 2 skins fixing some stuff

38f14a4c1892b4f8a5abf01379b32c054b25f78b authored over 1 year ago by techno-sam <[email protected]>

merge 1.18/dev into 1.18/thundxrconductor

06f22813925c8bec8d1cd353d7cfabb02226dfb3 authored over 1 year ago by IThundxr <[email protected]>

change Boolean -> boolean

e285c103551c880f1126fe3bc0b6266ae85bc86a authored over 1 year ago by IThundxr <[email protected]>

mattentosh skin and /snr conductor_demo command

db126a411dbe5c798e402e6a594ecf584e8aa99b authored over 1 year ago by techno-sam <[email protected]>

more progress

d013d0cad32b88a825766a02f07758bdf7af65a3 authored over 1 year ago by techno-sam <[email protected]>

revert mixin change

a1c513b6428ca6a4e705b69956bbbefe9fb89c97 authored over 1 year ago by IThundxr <[email protected]>

test

d96b36a5da31349c5c1aee5b7998eea7f1df1966 authored over 1 year ago by IThundxr <[email protected]>

revert mixin change

8e9e82d62510464f5d16df9746528bd8fe0dbd43 authored over 1 year ago by IThundxr <[email protected]>

revert mixin change

69746acdc6e21fddd6e18106418c65793f23c636 authored over 1 year ago by IThundxr <[email protected]>

Merge branch '1.18/dev' into 1.18/thundxrconductor

f3669c9942b4c8403bba2635bcbe9d63f083b7b9 authored over 1 year ago by IThundxr <[email protected]>

Fixed and works!

e2574f91c2dd9144ee304fd11908b4b1fa426fce authored over 1 year ago by IThundxr <[email protected]>

new

77a19a97e854dac808ca8b47595059952d031b26 authored over 1 year ago by IThundxr <[email protected]>

jank

76e523bae9011a8bd6bc96660df64284ce12ab59 authored over 1 year ago by IThundxr <[email protected]>

progress save

81ffaf8842daed1aaf7a8b30f30298e9b92cf1e4 authored over 1 year ago by IThundxr <[email protected]>

progress save x2

b06b1c7f9e67148c95b6072fd842eddd7afd67f7 authored over 1 year ago by IThundxr <[email protected]>

progress save

b3ef5b79b5b1756f96f54b46e82bcd355d175205 authored over 1 year ago by IThundxr <[email protected]>

Merge pull request #164 from Layers-of-Railways/1.18/bogeys

Add lots of bogeys & conductor features

602518ec94b8291c9929a28dde77c1a6126399e1 authored over 1 year ago by techno-sam <[email protected]>

Merge branch '1.18/dev' into 1.18/bogeys

a800adbb71dea8fba3527945792d54ac35a24fb0 authored over 1 year ago by techno-sam <[email protected]>

Add conductor recipe and fix downwards motion

cfd57cd9f180f57fad8c72044d9ed4dbae97641e authored over 1 year ago by techno-sam <[email protected]>

Sus?

Added vents

c43ae1aaa595f1764ff1c809d625d858a3a6eb41 authored over 1 year ago by techno-sam <[email protected]>

Vents part 1

fee62a841354a37dcda9b259126bf335507ed33f authored over 1 year ago by techno-sam <[email protected]>

Fix copycat rendering on forge

(flipped chunk load and unload events)
fix sodium/rubidium compat

0f1dbebd29b83cf96c81770bd4856b169165a44e authored over 1 year ago by techno-sam <[email protected]>

Merge branch '1.18/dev' into 1.18/thundxrconductor

b3843991ed55891f93306d76b00a60c68ac0f512 authored over 1 year ago by IThundxr <[email protected]>

Add 2 skins fixing some stuff

0bb56629bef9dc0245dbc36c0f9740c687429524 authored over 1 year ago by IThundxr <[email protected]>

Merge pull request #162 from Layers-of-Railways/1.18/littlechasiu_conductor

littlechasiu conductor cap/skin 👀

449ac0f272c9a128aaceba16cf15d1a601b661a1 authored over 1 year ago by IThundxr <[email protected]>

Add littlechasiu conductor cap/skin

fda1172ae788ad5a3688f335deb0ff0fe6f00072 authored over 1 year ago by Jennifer Chan <[email protected]>

start working on conductor morph

82f1cb79ef94b6dd51ecff8936c6e927aad3e148 authored over 1 year ago by techno-sam <[email protected]>

Merge remote-tracking branch 'origin/1.18/bogeys' into 1.18/bogeys

e50c4180f5b0b3bf3f94117920933e97263eb42e authored over 1 year ago by techno-sam <[email protected]>

conductor spies can now use blocks

cee99c722210bf70d516e3f7e1fbb0a4ad044c8a authored over 1 year ago by techno-sam <[email protected]>

fix mixin target, add shader for conductor spy

8a07bcdfde201536e0fa27a816fe073e4865ba1d authored over 1 year ago by techno-sam <[email protected]>

minor tooltip change

52313787d8fbe5e5876dd0404273a395904afe19 authored over 1 year ago by SpottyTheTurtle <[email protected]>

Fix monorail bogey placement

dc4ca5c39197ab46f5cf16ad9e71058e56948ad5 authored over 1 year ago by techno-sam <[email protected]>

Prevent conductors taking damage and dismounting on trains

a75148d2c8885c0dcbbac1c44cea1c094e2a21c8 authored over 1 year ago by techno-sam <[email protected]>

Prevent conductors taking damage and dismounting on trains

558d8aa89c26197b6dc46c7a49c6b295d1b191a0 authored over 1 year ago by techno-sam <[email protected]>

fix signal display source

ff6fdf73b06b02a548ed0202a0051a2ccb35eca0 authored over 1 year ago by techno-sam <[email protected]>

[ci skip] remove completed todo

21625ff042b44d1f53075d9ee60057e32f7a46d7 authored over 1 year ago by techno-sam <[email protected]>

General fixes for conductor controlled trains and switch ui

71f0f867cbf23b270b65d07cc9318d4658a0b5f6 authored over 1 year ago by techno-sam <[email protected]>

Conducting the future

Remote-control conductors now drive trains

dfe6cda285c41f8e0ec543762d7833d1055383b1 authored over 1 year ago by techno-sam <[email protected]>

Merge remote-tracking branch 'origin/1.18/bogeys' into 1.18/bogeys

bccdda2669af4a1f2affd8346e7b0ef9809f4ac3 authored over 1 year ago by techno-sam <[email protected]>

Where are you?

Remote-control conductors with redstone links

7b4cf8a6826e7641401b97d0938eac5cbd2688b5 authored over 1 year ago by techno-sam <[email protected]>

DFU fixes

e2b39f08bf76f2da0307ef9fb9eb2ddfe4ba164f authored over 1 year ago by techno-sam <[email protected]>

fix leafspring bogey

6fec409ca3b07a2a36d567557565f409dd18620f authored over 1 year ago by SpottyTheTurtle <[email protected]>

Fix up bogey menu

use icons where available

9c8db55b61014f89871f57342877bab2c8d6f11e authored over 1 year ago by techno-sam <[email protected]>

Fix hover box

13fdc835cfec8fede7b1c8be8edd44a33be07c01 authored over 1 year ago by techno-sam <[email protected]>

Huh? Track Switch Ponder

6d0948528896e2171285e45b2c4d2837dda617bf authored over 1 year ago by techno-sam <[email protected]>

Start switch ponder

d8cb0276402ff30583c02b8459012e84d7d70093 authored over 1 year ago by techno-sam <[email protected]>

Track Replace mode for rollers

afd2c75090d3e36e596b69aa33f5d9a282dc89bb authored over 1 year ago by techno-sam <[email protected]>

add icons for bogeys

776a8e084a2f95de124629fd84d4e2b35543c990 authored over 1 year ago by techno-sam <[email protected]>

[ci skip] conductors operate switches

f79b7da0d0f6e94cf368e617464baf2abe8238e1 authored over 1 year ago by techno-sam <[email protected]>

[ci skip] update changelog

ea1b9da95174bd7b77e4d4ab2125250a25be0f5e authored over 1 year ago by techno-sam <[email protected]>

Fix up bogeys

1a1661b9afefca03a47d1cf7c864bacc90b6de81 authored over 1 year ago by techno-sam <[email protected]>

add tooltip to train casing

93e318d1e922b1e992b89b0aceef85a2d545f370 authored over 1 year ago by techno-sam <[email protected]>

All Bogeys Complete!

- only remaining issues are the GUI not properly working with some styles and the center of rotat...

7d0ace2d7d67f34d5e5af9968a8546ef8b639ef2 authored over 1 year ago by SpottyTheTurtle <[email protected]>

modern, blomberg, y25 + merge 1.18/dev into 1.18/bogeys

f3fe290e5af64a9d38bb62731835be084f6c830c authored over 1 year ago by SpottyTheTurtle <[email protected]>

Merge remote-tracking branch 'origin/1.18/dev' into 1.18/bogeys

# Conflicts:
# common/src/main/java/com/railwayteam/railways/registry/CRBogeyStyles.java
# commo...

7445ab78f866f1f41b21485cdca385ebf5ea4fb2 authored over 1 year ago by SpottyTheTurtle <[email protected]>

Merge remote-tracking branch 'origin/1.18/dev' into 1.18/bogeys

# Conflicts:
# common/src/generated/resources/.cache/cache
# common/src/main/resources/assets/ra...

703b66f4a9c55126c6ec0ad87f70b6a48ab8da9a authored over 1 year ago by SpottyTheTurtle <[email protected]>

Fix mixin priorities

a50bc62bc255b372898b4cfc29affab2df847258 authored over 1 year ago by techno-sam <[email protected]>

Style selection gui complete

15f268de09327bf1f508d1bb35c08db8d04bf62e authored over 1 year ago by techno-sam <[email protected]>

optimize bogey size block usage

0190b920d7847ead1edcdf818060863427fd772b authored over 1 year ago by SpottyTheTurtle <[email protected]>

Freight, archbar and passenger bogeys

d11429658cc22beba7f2b840aa804bb521a93cb3 authored over 1 year ago by SpottyTheTurtle <[email protected]>

coilspring bogey

43a0f95e1779c399d9de8244b1ed3b1861710893 authored over 1 year ago by SpottyTheTurtle <[email protected]>

Finish migration to common renderer

cfe85cfa21642819193366654fa2636c79ae2d6a authored over 1 year ago by SpottyTheTurtle <[email protected]>

singleaxle almost working

-textures aren't mapped properly
-offset of frame is off

8be05bd2f84e000901df0b37316c6aa8121813cf authored over 1 year ago by SpottyTheTurtle <[email protected]>

Merge remote-tracking branch 'origin/1.18/dev' into 1.18/dev

900dccbd525b546b319bf350c0d0bae6bd68ba77 authored over 1 year ago by techno-sam <[email protected]>

Fix nixie tube signals

3f54bb05a16bd1d24c60392144c2562fa11f76e8 authored over 1 year ago by techno-sam <[email protected]>

more work on the singleaxle bogey

01c47ac0283d1d79324aaf1a22296022e2674822 authored over 1 year ago by SpottyTheTurtle <[email protected]>

Switch changes

9870597c3eac8a5b1cd9a564d881cd63bf47ded1 authored over 1 year ago by techno-sam <[email protected]>

merge 1.18/dev into 1.18/new_Bogeys, start reimplementing Singleaxle bogey

afbb6edbe918550d9f70eff0464da7936cc21647 authored over 1 year ago by SpottyTheTurtle <[email protected]>

undo push to wrong branch

0e11d73d555616085db4ffda775cfa66d294957c authored over 1 year ago by SpottyTheTurtle <[email protected]>

merge 1.18/dev into 1.18/new_Bogeys, start reimplementing Singleaxle bogey

7958e1300ff04a24e66211599b84c6e01595bd24 authored over 1 year ago by SpottyTheTurtle <[email protected]>

Fix roller breaking custom tracks, fix switch hud not disappearing properly

9c69ed810e260e17e74e7e3ea307595d94ef56e2 authored over 1 year ago by techno-sam <[email protected]>

[ci skip] Merge pull request #148 from Layers-of-Railways/l10n_translations

New Crowdin translations

ad5d17f6308d6b9219c6ee239317e3876420c65f authored over 1 year ago by techno-sam <[email protected]>

New Crowdin translations by Github Action

58f0ad4aba97361af77d72112f5045ec6f353020 authored over 1 year ago by Crowdin Bot <[email protected]>

Merge pull request #147 from Layers-of-Railways/l10n_translations

New Crowdin translations

985e80bcf8861442af5bb77d9a85b4416897b549 authored over 1 year ago by techno-sam <[email protected]>

Update track models, fix switch rendering

50356f5f6ba377f644b17db79754dcfa5ddb9baa authored over 1 year ago by techno-sam <[email protected]>

Merge remote-tracking branch 'origin/1.18/dev' into 1.18/dev

49dcd8c8aa172a938b27478e5642be95d1bab55c authored over 1 year ago by techno-sam <[email protected]>

invisible bogeys

2cc56135db1080c816d7c909c10f2ee814ef5c8b authored over 1 year ago by techno-sam <[email protected]>

e

3ec7d1ad8f98048c5192b8debb1157136fc1be2a authored over 1 year ago by IThundxr <[email protected]>

bump ver

16180003d71f8a309b8b84aa67edbc97e98104b8 authored over 1 year ago by IThundxr <[email protected]>

fixin' mixin

2a8e1400b029d03e736e5eefa83f03624ec88562 authored over 1 year ago by techno-sam <[email protected]>

New Crowdin translations by Github Action

97e3cdd98dcdd41d74767c725f3adb2ee621750c authored over 1 year ago by Crowdin Bot <[email protected]>

Merge pull request #146 from Layers-of-Railways/1.18/switches

Add Switches

3399b5cd3b17f05da5cb34d6ff1217418089748f authored over 1 year ago by techno-sam <[email protected]>

[ci skip] changelog update

d5309595d17fa224ddf040d4b9db9017fba98aad authored over 1 year ago by techno-sam <[email protected]>

Improve textures by ToOpa

51651fa4d91dd70a3835caa54d7a2ab23e4fda9c authored over 1 year ago by To0pa <[email protected]>

[ci skip] remove todo's that are done

dc16ba402e5fe578ab8894225138b7371b559dc3 authored over 1 year ago by techno-sam <[email protected]>

Improve switch controls

0a937b571b52f03a1b6e39cbb57007451b5c3616 authored over 1 year ago by techno-sam <[email protected]>

improve gui overlay

7201375120c5c28c7e7478b717e75dd31ee8ad64 authored over 1 year ago by techno-sam <[email protected]>

Updated art, better brass switch behaviour

09f793278ba583c1ddbe0ffad4c821aaeeacff01 authored over 1 year ago by techno-sam <[email protected]>

Fix switch technicalities

prevent multiple switches occupying the same track
make angled track suggestions work
todo: bras...

6376ffc4a8395fd9bac784489f27d1fe5f71d44c authored over 1 year ago by techno-sam <[email protected]>

[ci skip] add dev build run config

35c01e617e27b548872899262d940c4f6ce986ec authored over 1 year ago by techno-sam <[email protected]>

[ci skip] add dev build run config

3c695d02232a21563c092843ba2c6fe814f78ed9 authored over 1 year ago by techno-sam <[email protected]>

Ecosyste.ms: OpenCollective

github.com/Layers-of-Railways/Railway