elix-x
b31e5f5356
Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering
...
# Conflicts:
# src/main/java/appeng/decorative/solid/BlockQuartzGlass.java
# src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json
# Changed naming convention.
2016-08-19 12:49:25 +02:00
elix-x
3d2ba425ec
Change of naming convention
...
Changed naming convention. All AE blocks, items and TEs were affected.
Most of assets were transfered, but some sill need help. Localizations
will be transfered in a separate commit.
Closes #46 .
2016-08-19 12:38:21 +02:00
shartte
845d4da353
Implemented display of icons for MultiItem ( #50 )
...
* Implements rendering of MultiItem items.
2016-08-16 18:58:28 +02:00
shartte
115f73de2e
Implemented Glass Blocks ( #51 )
...
* Implemented connected texture glass blocks (different approach from 1.7).
2016-08-16 16:04:31 +02:00
shartte
026de7d590
Energy Cell Item Models ( #44 )
...
* Added energy cell item models.
* Removed the client-side only interface and moved to a method in AEBaseBlock instead.
2016-08-16 15:38:53 +02:00
shartte
785e40ce3e
Implemented quartz fixture model ( #34 )
...
* Implemented the actual quartz fixture model.
* Added a custom texture for the metal bits of the quartz fixture.
2016-08-16 15:38:24 +02:00
shartte
24ddc0e574
Controller Model ( #33 )
...
* Implemented the controller models (using the UVL model loader to make the lights be fullbright at night).
2016-08-15 10:28:45 +02:00
shartte
a422de6adb
Fixes charger model and adds an appropriate item model. ( #29 )
2016-08-14 13:28:45 +02:00
shartte
7f923d7f25
Added a powered state for the crystal growth accelerator and added corresponding models. ( #39 )
2016-08-14 13:28:03 +02:00
shartte
5a7d099413
Added active state for vibration chamber and corresponding models. ( #40 )
2016-08-14 13:27:36 +02:00
shartte
53fd4de0cc
Added stair blocks. ( #47 )
2016-08-14 13:26:53 +02:00
shartte
92b931434e
More item models ( #30 )
...
* Fixed tiny TNT item model.
* Flipped the inscriber north/south and implemented item model.
* Added several item models.
2016-08-11 13:48:36 +02:00
elix-x
3d1d2a3468
Fixed stairs & chests rendering
...
-Fixed chests rendering in inventory (kinda).
-Fixed stairs rendering.
From now on, all blocks with multiple states MUST have item model.
Example stair provided (though with incorrect textures).
Relates to #9 .
2016-08-10 12:10:48 +02:00
dpeter99
4eccb1e770
New Models
...
- Wireless Point
- Tiny TNT
2016-07-11 21:38:40 +02:00
elix-x
524dc52dd6
Moved F2R, added TESRs, fixed culling
...
-Externalized FacingToRotation.
-BlockLightDetector now uses tile based rotations.
-Added TESR methods and TESRs for chests. Can't get it to work in
inventory.
-Fixed rotation bugs involving culling and lighting. Now rotating culled
faces and normals too. Closes #21 .
Relates to #9 , #10 and #20 .
2016-07-11 15:38:54 +02:00
elix-x
0809ac5625
Implemented automatic rotation
...
Implemented automatic rotation for all tile blocks. You can still use
facing properties in model files, if you want to.
Also, some added some fixes and improvements.
2016-07-05 19:43:51 +02:00
dpeter99
63fb23d1b6
Updated Item models
2016-07-02 17:24:27 +02:00
dpeter99
2e577edc3d
Model Update 1
...
- Removed textures
- Readded needed ones
- Added models, blockstates
- ChargedQuartzOreBlock
- ChiseledQuartzBlock
- FluixBlock
- QuartzBlock
- QuartzGlassBlock
- QuartzOreBlock
- QuartzPillarBlock
- SkyStoneBlock.BLOCK
- SkyStoneBlock.BRICK
- SkyStoneBlock.SMALL_BRICK
- SkyStoneBlock.STONE
- tile.BlockCellWorkBench
- tile.BlockCharger
- tile.BlockCondenser
- tile.BlockCreativeEnergyCell
- tile.BlockDenseEnergyCell
- tile.BlockDrive
- tile.BlockEnergyAcceptor
- tile.BlockEnergyCell
- tile.BlockGrinder
- tile.BlockInscriber
- tile.BlockIOPort
- tile.BlockSecurity
- tile.BlockSpatialIOPort
2016-07-02 17:21:51 +02:00
elix-x
9f96b86938
Enabled block states ignoring properties
...
Enabled block states ignoring. File with same name as block state, but
with .ignore.json extension. Although it's json extension, it is NOT IN
JSON FORMAT!!! Each line is name of property to ignore. Refers to #10 .
2016-07-01 20:19:10 +02:00
elix-x
e24d166f6a
Passing rotations to models
...
Implemented passing of rotations to models. Removed unused unlisted
properties. Included dummy grinder model. Found bugs that have to be
fixed.
Referencing #10 .
2016-06-30 15:51:42 +02:00
elix-x
0be0635a8f
Fixed item models.
...
Fixed all item models. Changed parent to "item/generated" and removed
display rotations as now they're done automatically.
Marks off ~all items in #9 .
2016-06-30 14:17:22 +02:00
Kasama
a122f939e0
Updated pt_BR.lang to match latest en_US
2016-04-27 13:07:06 +02:00
JJN
fdfc373181
fixed #2090
...
fixed #2090
2016-01-09 23:24:03 +01:00
Adaptivity
fdd16d8876
Ore Dictionary support for recipes
...
Added missing changes to oredict.recipe
2016-01-09 23:23:50 +01:00
Wilhelm Schuster
242c05266f
Update and extend German translation
...
Add translated achievements.
2016-01-01 02:45:21 +01:00
XFRGod
f054bd699b
Update hu_HU.lang
...
This is a language "correction"(?) and typo fixing update for the lang file and now it's 110% localized:D
2015-12-23 14:43:49 +01:00
XFRGod
daf2587140
Update hu_HU.lang
...
Okay now it's absolutely 100% done and I'm officially dead.
Onto EnderIO and Botania then!
2015-12-23 14:42:28 +01:00
XFRGod
18bf78b379
Update hu_HU.lang
2015-12-23 14:42:05 +01:00
bakaxyf
faaff58fde
Update zh_CN.lang
...
1728f683c3
d893e52eb0
24224a450b
2015-12-23 14:38:17 +01:00
yueh
1e7126f98e
Added an option to toggle oredict subsitutions for patterns.
...
It adds a backward compatibility to convert current patterns to use
oredict by default, which should be removed with rv4 stable.
Closes #1156
2015-12-23 14:34:28 +01:00
thatsIch
888b3e5600
Closes #1899 , Fixed #1898 : Adds an easy way to export interesting information into CSV format
...
Mostly used for the recipe system, but can also be used for debugging purposes. Debug options needs to be ticked to use the full information gain. Recipes only require the normal localization and the specific name plus metadata.
Shifted the recipes into a recipes folder where the CSV will also reside. This will also elevate the copying of the readme to the user directory since it can reside in the recipes folder.
Fixed a bug where the copier would copy the would also copy empty folders
2015-12-23 14:32:53 +01:00
asd0210a
73f928d57a
zh_tw.lang Updated
2015-09-30 13:52:01 +02:00
yueh
ef6bc3e58f
Changed the interface to 9 slots to be consistent with every other machine
2015-09-30 13:42:31 +02:00
yueh
0ce551589e
Added a missing whitespace and removed duplicate ones.
2015-09-30 13:42:14 +02:00
Mazdallier
f89f79d71c
Update fr_FR.lang
2015-09-30 13:41:25 +02:00
thatsIch
0d312f91af
Fixes #1850 : Fixed support for second optional output of the AE2 Grindstone
2015-09-30 13:41:15 +02:00
thatsIch
468cb4e9df
Fixes #1588 : Charged Certus Quartz Ore was given a wrong name
2015-09-30 13:40:03 +02:00
yueh
84fa5a38e0
Reorganizes the recipes in a more reasonable way.
...
The recipes are now structured into multipe subfolder and split into more
distinct files, so the names are more appropriate and are better at
hinting which items the actually contain.
It also extends the RecipeResourceCopier to now handle the folder
recursively and extract all subdirectories and their files.
"import=" is currently requiring a relative path to the root directory
of the recipes. This would require a larger rewrite/refactoring, thus it
is kept for now until a potentially later changer.
This reverts splitting the oredict entries into their own directory and
moves them back into the recipes folder, as it currently is causing a
couple of issues like not being able to resolve the aliases or is not
working indev. But to keep it seperate it is now its own recipe file.
Fixes #1791
Reverts #1635
2015-09-30 13:39:09 +02:00
yueh
b0504f4141
Closes #1726 : Added Pressure P2P tunnel (PneumaticCraft)
2015-09-30 13:19:57 +02:00
bakaxyf
95b50748d2
Update zh_CN.lang
2015-09-30 13:04:22 +02:00
yueh
67213462db
Adds a round robin and random mode to export buses.
...
Resolves #85
2015-09-30 13:04:02 +02:00
yueh
c978bf90f8
Ensure that disabled parts are actually disabled and removed.
2015-09-30 12:30:47 +02:00
thatsIch
59dbfb1452
Fixed stairs
2015-09-30 11:34:16 +02:00
thatsIch
8b921a7b79
Removed registration of layers
2015-06-26 22:50:09 +02:00
thatsIch
e21dab14e5
Fixed stair rendering, still missing textures and itemblock for some reason
2015-06-26 22:44:47 +02:00
thatsIch
4e863e7d90
Removed old renamer
2015-06-26 22:13:04 +02:00
thatsIch
0e378d8ad4
Added all stairs
2015-06-26 01:06:35 +02:00
bakaxyf
cc78153fe4
Update zh_CN.lang
2015-06-22 15:38:43 +02:00
yueh
ed47a23156
Closes #12 Added visual lock state to monitors
...
Some general refactoring of every monitor including panels and terminals.
Disabled glPushAttrib and glPopAttrib for StorageMonitor as this can be a
performance issue.
Conflicts:
src/main/java/appeng/parts/AEBasePart.java
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
src/main/java/appeng/parts/reporting/PartDarkMonitor.java
src/main/java/appeng/parts/reporting/PartMonitor.java
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
src/main/java/appeng/parts/reporting/PartSemiDarkMonitor.java
src/main/java/appeng/parts/reporting/PartStorageMonitor.java
src/main/java/appeng/parts/reporting/PartTerminal.java
2015-06-22 15:34:46 +02:00
yueh
3b5b9b68ce
Moved ETA to the title and also no longer display for empty jobs
...
Fixes #1567
2015-06-18 01:22:45 +02:00
thatsIch
efafaedf68
Fixes #1588 : Charged Certus Quartz Ore has its own oredictionary entry
...
Conflicts:
src/main/java/appeng/block/solids/OreQuartz.java
2015-06-18 00:45:55 +02:00
AlgorithmX2
38afde724b
Most of the 1.8 Port.
2015-06-15 19:44:59 -05:00
thatsIch
17465e68e8
Merge pull request #1453 from thatsIch/f-1452-auto-gen-custom-recipes
...
Closes #1452 : Implements auto-generation of custom recipes
2015-06-03 23:18:35 +02:00
yueh
776d68bb03
Merge pull request #1486 from yueh/feature-1259
...
Closes #1259 ETA for crafting jobs
2015-06-01 19:51:47 +02:00
yueh
4befdecd25
Closes #1344 Added a silk touch annihilation plane
2015-06-01 19:50:38 +02:00
thatsIch
0076f2ea51
Closes #1452 : Implements auto-generation of custom recipes
2015-06-01 17:37:25 +02:00
Lemmmy
58bdeb134c
Proper English localisation
2015-06-01 01:54:44 +01:00
PetaByteBoy
c00962b044
add slabs
2015-05-23 15:02:29 +02:00
yueh
61dfc05ae0
Added a simple ETA to crafting jobs
2015-05-21 21:31:13 +02:00
bakaxyf
ed1f327c57
Update zh_CN.lang
2015-05-20 16:10:04 +08:00
TheJulianJES
77873e135f
Changed things in de_DE.lang
...
Fixed a derp
Changed it, again!
Fixed it (all)
Added line 450
2015-05-09 23:20:53 +02:00
Florian Nücke
18503ac526
Added P2P tunnel part for OpenComputers.
...
Includes cleanup provided by thatsIch.
2015-05-09 14:53:54 +02:00
thatsIch
3d5fd2c5e8
Merge pull request #1408 from thatsIch/e-logo
...
Closes #1404 : Added logo to AE2
2015-05-08 19:44:02 +02:00
thatsIch
81464d7de1
Closes #1404 : Added logo to AE2
2015-05-08 18:47:18 +02:00
thatsIch
00248f574a
Fixes #1411 : Adds recipes for stairs
2015-05-08 18:32:44 +02:00
Lorenzo Dalla Costa Cervelin
34665d94df
Update pt_BR.lang
2015-05-06 14:38:21 -03:00
yueh
f364359905
Removed MJ as icon
...
Fixes #1348
2015-04-28 18:28:54 +02:00
Yves
43a47f8971
Update fr_FR.lang
...
Minor correction and group organisation
2015-04-27 13:23:28 +02:00
TheVikingWarrior
ee977720ca
Update it_IT.lang
2015-04-26 15:48:53 +02:00
Anton
9451106c81
Update ru_RU.lang
2015-04-24 07:51:44 +03:00
thatsIch
eca598516e
Fixes #1277 : Removed config option for MJ-P2P Tunnel
2015-04-23 23:45:32 +02:00
thatsIch
f582c8081b
Merge pull request #1275 from thatsIch/e-1270-nei-grinder-localization
...
Closes #1270 : Improves NEI grinder overlay localization
2015-04-23 23:42:26 +02:00
theelixzammuto
f878a7598d
Update it_IT.lang
2015-04-14 18:07:07 +02:00
thatsIch
b282e5d968
Closes #1270 : Improves NEI grinder overlay localization
2015-04-13 12:53:55 +02:00
bakaxyf
4f9b8db6fc
Update zh_CN.lang
2015-04-08 12:16:13 +08:00
bakaxyf
a7d55ee520
Update zh_CN.lang
2015-04-07 04:39:19 +08:00
thatsIch
aac2b598ea
Merge pull request #1221 from Adaptivity/rv2
...
Update ru_RU.lang
2015-04-06 20:30:44 +02:00
thatsIch
04a6a683bc
Merge pull request #1220 from thatsIch/e-1219-hardcoded-localizations
...
Fixes #1219 : Improved localization options
2015-04-06 15:44:36 +02:00
Anton
fbc44f47c8
Update ru_RU.lang
2015-04-06 16:32:05 +03:00
thatsIch
8321a5fe1c
Fixes #1219 : Improved localization options
2015-04-06 13:37:40 +02:00
thatsIch
a30ef4679c
Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display
2015-04-05 23:06:31 +02:00
thatsIch
33c1535bfa
Fixes #1061 Most recipes are properly registered with new Mekanism.
2015-03-25 12:24:21 +01:00
bakaxyf
a870393edb
Update zh_CN.lang
2015-03-25 16:37:46 +08:00
Kamran Mackey
b5582688a3
Fixed a couple typos in en_US.lang.
2015-03-21 03:57:41 -06:00
TheVikingWarrior
f132ae3678
Update it_IT.lang
2015-03-16 20:59:01 +01:00
bakaxyf
621ddc5535
Update zh_CN.lang
2015-03-15 11:05:24 +08:00
bakaxyf
99e4928542
Update zh_CN.lang
2015-03-12 00:09:12 +08:00
thatsIch
dd1ca1e286
Fixes #861 Wireless Terminal notifies player, if it is unlinked
2015-03-11 09:00:40 +01:00
Yves
5e5be0e192
Update fr_FR.lang
2015-03-09 13:46:12 +01:00
thatsIch
dddfd6dbaf
Fixes #972 Tooltip now corresponds to the actual behaviour
2015-03-09 10:07:13 +01:00
bakaxyf
27e5eac6aa
Update zh_CN.lang
2015-02-25 13:47:40 +08:00
Chris
8eb5ad01cf
Merge pull request #776 from al-myr/patch-1
...
Update pt_BR.lang
2015-01-19 12:22:42 -08:00
yueh
c35e057d96
Merge pull request #742 from LeerSpace/patch-1
...
fixed two grammatical errors
2015-01-19 19:53:35 +01:00
yueh
c10c809c9e
Merge pull request #734 from yueh/feature-formation-plane-drop-blocks
...
Formation plane can now drop blocks as items
2015-01-19 19:45:04 +01:00
Al
afbce77d0b
Update pt_BR.lang
2015-01-19 07:51:22 -03:00
John Reed
e2798aaaf4
fixed two grammatical errors
...
replaced "a" with "an" where appropriate
2015-01-17 12:23:19 -06:00
yueh
a8c920932e
Formation plane can now drop blocks as items
2015-01-16 19:58:11 +01:00
thatsIch
c6f232ab63
Fixes #304 WAILA Integration updated and fixed
...
WAILA offers a new interface to sync the server data to the client.
2015-01-04 00:06:09 +01:00
Anton
e37d9099c7
Update ru_RU.lang
2014-12-28 22:24:53 +03:00
Mitchell
0cf33c4ea3
Fix grammatical error
...
Than = Comparison
2014-12-25 09:16:22 -04:00