Skip to content

Develop -> master #8

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 214 commits into from
Nov 28, 2020
Merged

Develop -> master #8

merged 214 commits into from
Nov 28, 2020

Conversation

@NikolaySavenko
Copy link
Collaborator

First Release?

@NikolaySavenko
Prepared for work with TS
cb1b8b0
@NikolaySavenko
Create README.md
8d5459b
@NikolaySavenko
Engine class
8c0ddf4
@NikolaySavenko
Merge pull request #3 from mineprogramming/feature/engines
d0707e6 
Engine class
@NikolaySavenko
updated .gitingnore
48cf609
@NikolaySavenko
animation develop was started
75f9071
@NikolaySavenko
added renders for base and trunk
508262d
@NikolaySavenko
finished static engine render
bc3d835
@NikolaySavenko
added simple engine animation
cb8c996
@NikolaySavenko
finished animations
dbce717
@NikolaySavenko
some garbage collected
b9c6135
@NikolaySavenko
prepared for render manager test
e2294d9
@NikolaySavenko
small code improvements
e633560
@NikolaySavenko
Reorganized animations
312f74b
@NikolaySavenko
destroy animation on destroy block and small code improvements
44eb18a
@NikolaySavenko
Created RenderManager
65e0e60
@NikolaySavenko
render manager merge
b39de90
@NikolaySavenko
small tests
19bff07
@NikolaySavenko
Combined trunk and base into 1 render
38f8d7f
@NikolaySavenko
prepared for rotation
4f18edf
@NikolaySavenko
added EnergyNet library from IC2
92ba112
@NikolaySavenko
rotation with broken UV
2714969
@NikolaySavenko
finished rotation
f741119
@NikolaySavenko
deleted rotation branch
57df202
@NikolaySavenko
small code improvements
f228e43
@NikolaySavenko
added engine blockType and removed refresh message
d2eaebc
@NikolaySavenko
added part of methods from java mod version
bf435f0
@NikolaySavenko
updated lint rules
2de1036
@NikolaySavenko
added main methods for update()
e8c65e5
@NikolaySavenko
fixed problem with abstract tileEntity in BCEngine
f31239a
NikolaySavenko and others added 28 commits November 3, 2020 16:36
@NikolaySavenko
fixed saver bug
b14e49a
@NikolaySavenko
improved engine place function
647c1cb
@NikolaySavenko
declarations update and decrease item fix
959a60b
@NikolaySavenko
fixed region in iron and obsidian pipes
72e0150
@NikolaySavenko
obsidian pipe fix
eea93c2
@SDesya74
Fix null reference exception with pipeConnector
b474822
@NikolaySavenko
Merge pull request #7 from SDesya74/develop
a7604e9 
Fix null reference exception with pipeConnector
@NikolaySavenko
Merge branch 'develop' of https://github.com/mineprogramming/BuildCraft…
38a5adb 
… into develop
@NikolaySavenko
Fixed engine rotaton and updated declarations
25d6683
@NikolaySavenko
updated engine rotation by neighbour
b6f0ebc
@NikolaySavenko
simple structure to hand model support
6b2e98a
@NikolaySavenko
added trunk to model
821c8b9
@NikolaySavenko
added piston to hand model
56c30e8
@NikolaySavenko
added chamber to hand model
07f52c0
@NikolaySavenko
deleted engine item
9562f91
@NikolaySavenko
Merge branch 'feature/egnine-item-models' into develop
b66d62a
@NikolaySavenko
garbage collected and wrench fixed
26cdbce
@NikolaySavenko
mod icon updated
b4313aa
@NikolaySavenko
fixed engine default rotation
ff975d5
@NikolaySavenko
correct names and translations
c98cc30
@NikolaySavenko
recipes for engines
faaccea
@NikolaySavenko
recipes for pipes
70d8832
@NikolaySavenko
Block types
d8e8f81
@NikolaySavenko
icon cache group
3261eda
@NikolaySavenko
engine recipes fix
56e0a58
@NikolaySavenko
update Wooden Engine translation
6cf56ca
@NikolaySavenko
Merge branch 'release/1.0.0' into master
cf2ac8d
@NikolaySavenko
Merge tag '1.0.0' into develop
2ca8557 
First Release
@NikolaySavenko NikolaySavenko merged commit 8edf9e8 into master Nov 28, 2020
NikolaySavenko added a commit that referenced this pull request Nov 30, 2020
@NikolaySavenko
Merge pull request #9 from mineprogramming/master
4e8e357 
Merge pull request #8 from mineprogramming/develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@NikolaySavenko @SDesya74